Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[firefly-linux-kernel-4.4.55.git] / drivers / video / sun3fb.c

diff --git a/drivers/video/sun3fb.c b/drivers/video/sun3fb.c
index e046e20f02b91aead446abd4b62afa1117aaff7a..f80356dfa8e810e479a91ef485bb29bec78b7ff4 100644 (file)
--- a/drivers/video/sun3fb.c
+++ b/drivers/video/sun3fb.c
@@ -30,7 +30,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>