Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[~andy/linux] / drivers / video / q40fb.c

diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index fc91dbf896d2697b305b95fb6ad03c43852e34a0..48536c3e58a41afec3f6eb7bf7d7c6f17e22229c 100644 (file)
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -14,7 +14,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/interrupt.h>