diff options
| author | Jon Smirl <jonsmir@gmail.com> | 2006-07-10 04:44:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 13:24:16 -0700 |
| commit | a8f340e394ff30b79ab5b03c67ab4c94b2ac3646 (patch) | |
| tree | 54bb79dba4f3943e893bacd1efe7b265d7f86aaa /drivers/video/sis/sis_main.c | |
| parent | 67eb5db5874076db01febed5a1a9281628fa9fb4 (diff) | |
[PATCH] vt: Remove VT-specific declarations and definitions from tty.h
MAX_NR_CONSOLES, fg_console, want_console and last_console are more of a
function of the VT layer than the TTY one. Moving these to vt.h and vt_kern.h
allows all of the framebuffer and VT console drivers to remove their
dependency on tty.h.
[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/sis/sis_main.c')
| -rw-r--r-- | drivers/video/sis/sis_main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index b848ca7db7f..f8dfabd73b0 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c @@ -44,7 +44,13 @@ #include <linux/errno.h> #include <linux/string.h> #include <linux/mm.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) #include <linux/tty.h> +#else +#include <linux/screen_info.h> +#endif + #include <linux/slab.h> #include <linux/fb.h> #include <linux/selection.h> |