Merge branch 'mainline' into upstream-linus

[linux-2.6-omap-h63xx.git] / drivers / video / skeletonfb.c

diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 67f429e931899178ba25ac8b5eacfc3b09f9f085..bb96cb65fdaa554204e104d7cb8fb12fd4e33e0f 100644 (file)
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -47,7 +47,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>