Merge branch 'mainline' into upstream-linus

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

diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c
index 5ea2345dab993e8cb3aa3c28d6451f426d277737..64378959dd7b09fdcd23f1d4da13e5b2dbc5c7ff 100644 (file)
--- a/drivers/video/virgefb.c
+++ b/drivers/video/virgefb.c
@@ -39,7 +39,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/zorro.h>