Merge branch 'merge'

[safe/jmp/linux-2.6] / drivers / video / S3triofb.c

diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index 0f2ed75..397005e 100644 (file)
--- a/drivers/video/S3triofb.c
+++ b/drivers/video/S3triofb.c
@@ -28,7 +28,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>