Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index e714e8449c1d1bd844485773f06ce9fdd5d3060c..afd146f5f683fed27c6df1cb7b5f17689674ec07 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>