diff options
| author | Jon Smirl <jonsmir@gmail.com> | 2006-07-10 04:44:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 13:24:16 -0700 |
| commit | 894673ee6122a3ce1958e1fe096901ba5356a96b (patch) | |
| tree | 2fe842e63046ead098c5c61c0938ad8128934412 /drivers/video | |
| parent | a8f340e394ff30b79ab5b03c67ab4c94b2ac3646 (diff) | |
| download | linux-894673ee6122a3ce1958e1fe096901ba5356a96b.tar.gz linux-894673ee6122a3ce1958e1fe096901ba5356a96b.tar.bz2 linux-894673ee6122a3ce1958e1fe096901ba5356a96b.zip | |
[PATCH] tty: Remove include of screen_info.h from tty.h
screen_info.h doesn't have anything to do with the tty layer and shouldn't be
included by tty.h. This patches removes the include and modifies all users to
directly include screen_info.h. struct screen_info is mainly used to
communicate with the console drivers in drivers/video/console. Note that this
patch touches every arch and I have no way of testing it. If there is a
mistake the worst thing that will happen is a compile error.
[akpm@osdl.org: fix arm build]
[akpm@osdl.org: fix alpha build]
Signed-off-by: Jon Smirl <jonsmir@gmail.com>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/console/dummycon.c | 1 | ||||
| -rw-r--r-- | drivers/video/console/vgacon.c | 1 | ||||
| -rw-r--r-- | drivers/video/sis/sis_main.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c index 7c8eeeb30a47..d9315d99445f 100644 --- a/drivers/video/console/dummycon.c +++ b/drivers/video/console/dummycon.c @@ -9,6 +9,7 @@ #include <linux/kdev_t.h> #include <linux/console.h> #include <linux/vt_kern.h> +#include <linux/screen_info.h> #include <linux/init.h> #include <linux/module.h> diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index 7f1f0e7a5b20..0a2c10a1abf8 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c @@ -47,6 +47,7 @@ #include <linux/spinlock.h> #include <linux/ioport.h> #include <linux/init.h> +#include <linux/screen_info.h> #include <linux/smp_lock.h> #include <video/vga.h> #include <asm/io.h> diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index f8dfabd73b00..895ebda7d9e3 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c @@ -45,7 +45,7 @@ #include <linux/string.h> #include <linux/mm.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) #include <linux/tty.h> #else #include <linux/screen_info.h> |