Merge master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / video / sun3fb.c

diff --git a/drivers/video/sun3fb.c b/drivers/video/sun3fb.c
index e046e20..f80356d 100644 (file)
--- a/drivers/video/sun3fb.c
+++ b/drivers/video/sun3fb.c
@@ -30,7 +30,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>