diff options
| author | Jon Smirl <jonsmir@gmail.com> | 2006-07-10 07:44:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 16:24:16 -0400 |
| commit | 894673ee6122a3ce1958e1fe096901ba5356a96b (patch) | |
| tree | 2fe842e63046ead098c5c61c0938ad8128934412 /arch/alpha | |
| parent | a8f340e394ff30b79ab5b03c67ab4c94b2ac3646 (diff) | |
[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 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/alpha_ksyms.c | 1 | ||||
| -rw-r--r-- | arch/alpha/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_sio.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c index 425643762bf5..f042cc42b00f 100644 --- a/arch/alpha/kernel/alpha_ksyms.c +++ b/arch/alpha/kernel/alpha_ksyms.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/in.h> | 14 | #include <linux/in.h> |
| 15 | #include <linux/in6.h> | 15 | #include <linux/in6.h> |
| 16 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 17 | #include <linux/screen_info.h> | ||
| 17 | #include <linux/tty.h> | 18 | #include <linux/tty.h> |
| 18 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 19 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index 254c507a608c..2cb9c4380113 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 20 | #include <linux/user.h> | 20 | #include <linux/user.h> |
| 21 | #include <linux/a.out.h> | 21 | #include <linux/a.out.h> |
| 22 | #include <linux/tty.h> | 22 | #include <linux/screen_info.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/config.h> /* CONFIG_ALPHA_LCA etc */ | 24 | #include <linux/config.h> /* CONFIG_ALPHA_LCA etc */ |
| 25 | #include <linux/mc146818rtc.h> | 25 | #include <linux/mc146818rtc.h> |
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c index cd85ef725e0e..a654014d202a 100644 --- a/arch/alpha/kernel/sys_sio.c +++ b/arch/alpha/kernel/sys_sio.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/tty.h> | 19 | #include <linux/screen_info.h> |
| 20 | 20 | ||
| 21 | #include <asm/compiler.h> | 21 | #include <asm/compiler.h> |
| 22 | #include <asm/ptrace.h> | 22 | #include <asm/ptrace.h> |
