Merge branch 'merge'

[mv-sheeva.git] / drivers / video / offb.c

diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 0e750a8510fc5aecd95de77fbf50f8261ae373ba..bad0e98fb3b6fa64165b77c21707f6306dd152b3 100644 (file)
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -17,7 +17,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>