ieee1394: merge from Linus

[linux-2.6-omap-h63xx.git] / drivers / video / console / dummycon.c

diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index 878707a0439824488cbdd7ae5d81b214e6dd2129..d9315d99445fe79c21d588d7d0e03d4821fc86a8 100644 (file)
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -7,9 +7,9 @@
 
 #include <linux/types.h>
 #include <linux/kdev_t.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/vt_kern.h>
+#include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/module.h>