Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / video / platinumfb.c

diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 450e802..983be3e 100644 (file)
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -22,7 +22,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>