Merge branch 'master' into export-slabh

[linux-2.6-block.git] / drivers / video / sunxvr500.c

diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
index 3803745d6eee75068f072929c13db42f10eaa1eb..b9c2b948d34d515b4cdccaa6c70d5ab1da29e063 100644 (file)
--- a/drivers/video/sunxvr500.c
+++ b/drivers/video/sunxvr500.c
@@ -5,7 +5,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/pci.h>
 #include <linux/init.h>