Skip to contentSkip to conversation

vt: Remove VT-specific declarations and definitions from tty.h

PATCH In review Antonino A. Daplas 1 participant 1 message Jun 30, 2006

Subsystems (5)
Framebuffer layer Arm Samsung Exynos TTY layer and serial drivers PA-RISC architecture +1 more subsystems
lore
Share & tools
lore

Antonino A. Daplas

author
#0 lore raw

PATCH 2/3 vt: Remove VT-specific declarations and definitions from tty.h

From: Jon Smirl <[email protected]>

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.

Signed-off-by Jon Smirl <[email protected]>
Signed-off-by Antonino Daplas <[email protected]>

---

 arch/parisc/kernel/pdc_cons.c          |    2 ++
 drivers/video/68328fb.c                |    1 -
 drivers/video/S3triofb.c               |    1 -
 drivers/video/amifb.c                  |    1 -
 drivers/video/arcfb.c                  |    1 -
 drivers/video/asiliantfb.c             |    1 -
 drivers/video/atafb.c                  |    1 -
 drivers/video/aty/aty128fb.c           |    1 -
 drivers/video/aty/radeon_base.c        |    1 -
 drivers/video/chipsfb.c                |    1 -
 drivers/video/cirrusfb.c               |    1 -
 drivers/video/console/dummycon.c       |    1 -
 drivers/video/console/fbcon.c          |    1 -
 drivers/video/console/mdacon.c         |    1 -
 drivers/video/console/newport_con.c    |    1 -
 drivers/video/console/promcon.c        |    1 -
 drivers/video/console/softcursor.c     |    1 -
 drivers/video/console/sticon.c         |    1 -
 drivers/video/console/vgacon.c         |    1 -
 drivers/video/controlfb.c              |    1 -
 drivers/video/cyber2000fb.c            |    1 -
 drivers/video/cyberfb.c                |    1 -
 drivers/video/dnfb.c                   |    1 -
 drivers/video/epson1355fb.c            |    1 -
 drivers/video/fbcmap.c                 |    1 -
 drivers/video/fbmem.c                  |    2 +-
 drivers/video/fbmon.c                  |    1 -
 drivers/video/g364fb.c                 |    1 -
 drivers/video/geode/gx1fb_core.c       |    1 -
 drivers/video/geode/gxfb_core.c        |    1 -
 drivers/video/hgafb.c                  |    1 -
 drivers/video/hitfb.c                  |    1 -
 drivers/video/hpfb.c                   |    1 -
 drivers/video/i810/i810_main.c         |    1 -
 drivers/video/igafb.c                  |    1 -
 drivers/video/imacfb.c                 |    2 +-
 drivers/video/imsttfb.c                |    1 -
 drivers/video/intelfb/intelfbdrv.c     |    2 +-
 drivers/video/intelfb/intelfbhw.c      |    1 -
 drivers/video/kyro/fbdev.c             |    1 -
 drivers/video/macfb.c                  |    1 -
 drivers/video/matrox/matroxfb_base.h   |    1 -
 drivers/video/maxinefb.c               |    1 -
 drivers/video/modedb.c                 |    1 -
 drivers/video/neofb.c                  |    1 -
 drivers/video/nvidia/nvidia.c          |    1 -
 drivers/video/offb.c                   |    1 -
 drivers/video/platinumfb.c             |    1 -
 drivers/video/pm2fb.c                  |    1 -
 drivers/video/pm3fb.c                  |    1 -
 drivers/video/pmag-aa-fb.c             |    1 -
 drivers/video/pvr2fb.c                 |    1 -
 drivers/video/q40fb.c                  |    1 -
 drivers/video/retz3fb.c                |    1 -
 drivers/video/riva/fbdev.c             |    1 -
 drivers/video/s3c2410fb.c              |    1 -
 drivers/video/savage/savagefb_driver.c |    1 -
 drivers/video/sis/sis_main.c           |    6 ++++++
 drivers/video/skeletonfb.c             |    1 -
 drivers/video/sun3fb.c                 |    1 -
 drivers/video/tdfxfb.c                 |    1 -
 drivers/video/tgafb.c                  |    1 -
 drivers/video/tx3912fb.c               |    1 -
 drivers/video/valkyriefb.c             |    1 -
 drivers/video/vesafb.c                 |    2 +-
 drivers/video/vfb.c                    |    1 -
 drivers/video/vga16fb.c                |    2 +-
 drivers/video/virgefb.c                |    1 -
 include/linux/console_struct.h         |    1 +
 include/linux/fb.h                     |    1 -
 include/linux/tty.h                    |   11 -----------
 include/linux/vt.h                     |   10 ++++++++++
 include/linux/vt_kern.h                |    1 +
 73 files changed, 25 insertions(+), 78 deletions(-)
arch/parisc/kernel/pdc_cons.c +2 -0
index 215d78c..bfa5c60 100644
@@ -90,6 +90,8 @@ static int pdc_console_setup(struct cons
 }
 
 #if defined(CONFIG_PDC_CONSOLE)
+#include <linux/vt_kern.h>
+
 static struct tty_driver * pdc_console_device (struct console *c, int *index)
 {
 	extern struct tty_driver console_driver;
drivers/video/68328fb.c +0 -1
index 78488bb..0dda73d 100644
@@ -32,7 +32,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/S3triofb.c +0 -1
index 455fda9..0850eac 100644
@@ -29,7 +29,6 @@ #include <linux/module.h>
 #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>
drivers/video/amifb.c +0 -1
index 3033c72..9c06446 100644
@@ -45,7 +45,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/config.h>
drivers/video/arcfb.c +0 -1
index 4660428..a84b0c0 100644
@@ -39,7 +39,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/asiliantfb.c +0 -1
index 29f9f0d..b9d3541 100644
@@ -35,7 +35,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/atafb.c +0 -1
index e69ab65..5831893 100644
@@ -53,7 +53,6 @@ #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
drivers/video/aty/aty128fb.c +0 -1
index 11cf7fc..aa08112 100644
@@ -53,7 +53,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/aty/radeon_base.c +0 -1
index 68b1564..61a5641 100644
@@ -59,7 +59,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/time.h>
drivers/video/chipsfb.c +0 -1
index d76bbfa..f75dee9 100644
@@ -20,7 +20,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/cirrusfb.c +0 -1
index dda240e..7513e64 100644
@@ -42,7 +42,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/console/dummycon.c +0 -1
index 1ecda91..5f70fc2 100644
@@ -7,7 +7,6 @@
 
 #include <linux/types.h>
 #include <linux/kdev_t.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/vt_kern.h>
 #include <linux/init.h>
drivers/video/console/fbcon.c +0 -1
index 5dc4083..d3cb007 100644
@@ -65,7 +65,6 @@ #include <linux/sched.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>	/* MSch: for IRQ probe */
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
drivers/video/console/mdacon.c +0 -1
index c89f90e..52ed12b 100644
@@ -31,7 +31,6 @@ #include <linux/sched.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
drivers/video/console/newport_con.c +0 -1
index 0304131..7fa1afe 100644
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/tty.h>
 #include <linux/kd.h>
 #include <linux/selection.h>
 #include <linux/console.h>
drivers/video/console/promcon.c +0 -1
index d6e6ad5..f02b3fe 100644
@@ -11,7 +11,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/console.h>
drivers/video/console/softcursor.c +0 -1
index 3957fc7..557c563 100644
@@ -10,7 +10,6 @@
 
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
drivers/video/console/sticon.c +0 -1
index 45c4f22..45586aa 100644
@@ -37,7 +37,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/errno.h>
 #include <linux/vt_kern.h>
drivers/video/console/vgacon.c +0 -1
index 01401cd..3c54777 100644
@@ -39,7 +39,6 @@ #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
drivers/video/controlfb.c +0 -1
index 655301a..8f69231 100644
@@ -37,7 +37,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/cyber2000fb.c +0 -1
index 55a3514..0dce249 100644
@@ -42,7 +42,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/cyberfb.c +0 -1
index a3e189f..c40e72d 100644
@@ -81,7 +81,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/zorro.h>
drivers/video/dnfb.c +0 -1
index 5abd3cb..b083ea7 100644
@@ -2,7 +2,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
drivers/video/epson1355fb.c +0 -1
index f0a621e..737257d 100644
@@ -48,7 +48,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/fbcmap.c +0 -1
index 1f98392..e8b135f 100644
@@ -13,7 +13,6 @@
 
 #include <linux/string.h>
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
drivers/video/fbmem.c +1 -1
index 31143af..f85ee96 100644
@@ -24,7 +24,7 @@ #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
-#include <linux/tty.h>
+#include <linux/vt.h>
 #include <linux/init.h>
 #include <linux/linux_logo.h>
 #include <linux/proc_fs.h>
drivers/video/fbmon.c +0 -1
index 3ccfff7..de93139 100644
@@ -26,7 +26,6 @@
  * for more details.
  *
  */
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/module.h>
 #include <linux/pci.h>
drivers/video/g364fb.c +0 -1
index 605d1a1..1b981b6 100644
@@ -21,7 +21,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/geode/gx1fb_core.c +0 -1
index 4d3a887..bcf9cea 100644
@@ -15,7 +15,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/geode/gxfb_core.c +0 -1
index 2ea851d..742fd04 100644
@@ -25,7 +25,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/hgafb.c +0 -1
index 4e39035..fb9e672 100644
@@ -36,7 +36,6 @@ #include <linux/errno.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/hitfb.c +0 -1
index f04ca72..36e2499 100644
@@ -18,7 +18,6 @@ #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
drivers/video/hpfb.c +0 -1
index abd920a..91cf3b5 100644
@@ -11,7 +11,6 @@ #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
drivers/video/i810/i810_main.c +0 -1
index 321c5ff..560e6a2 100644
@@ -34,7 +34,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/init.h>
drivers/video/igafb.c +0 -1
index 8a0c2d3..67f384f 100644
@@ -33,7 +33,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/imacfb.c +1 -1
index 7b1c168..9487833 100644
@@ -15,9 +15,9 @@ #include <linux/ioport.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/screen_info.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 
 #include <asm/io.h>
drivers/video/imsttfb.c +0 -1
index f73c642..5a32bb6 100644
@@ -22,7 +22,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/intelfb/intelfbdrv.c +1 -1
index 0a0a8b1..e7ed72b 100644
@@ -114,7 +114,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>

@@ -123,6 +122,7 @@ #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
+#include <linux/screen_info.h>
 
 #include <asm/io.h>
drivers/video/intelfb/intelfbhw.c +0 -1
index 7533b3d..4511c2d 100644
@@ -25,7 +25,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/kyro/fbdev.c +0 -1
index 477ad29..19da5f4 100644
@@ -17,7 +17,6 @@ #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioctl.h>
drivers/video/macfb.c +0 -1
index e6cbd9d..80a0438 100644
@@ -24,7 +24,6 @@ #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/nubus.h>
drivers/video/matrox/matroxfb_base.h +0 -1
index b717371..e48e1c7 100644
@@ -31,7 +31,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/maxinefb.c +0 -1
index f85421b..38c8d38 100644
@@ -29,7 +29,6 @@ #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
drivers/video/modedb.c +0 -1
index ff54546..d126790 100644
@@ -12,7 +12,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/sched.h>
drivers/video/neofb.c +0 -1
index 2f156b7..615624e 100644
@@ -60,7 +60,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/nvidia/nvidia.c +0 -1
index cbf1d00..44d543f 100644
@@ -15,7 +15,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/offb.c +0 -1
index ad1434e..6ebaee3 100644
@@ -18,7 +18,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/platinumfb.c +0 -1
index 335e374..bff64b4 100644
@@ -23,7 +23,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/pm2fb.c +0 -1
index 4e96393..81bd3db 100644
@@ -34,7 +34,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/pm3fb.c +0 -1
index 52c18a3..3383add 100644
@@ -58,7 +58,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/pmag-aa-fb.c +0 -1
index d92f352..68ca3cc 100644
@@ -29,7 +29,6 @@ #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
drivers/video/pvr2fb.c +0 -1
index ec4bacf..c6c904b 100644
@@ -53,7 +53,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/config.h>
drivers/video/q40fb.c +0 -1
index fc91dbf..48536c3 100644
@@ -14,7 +14,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
drivers/video/retz3fb.c +0 -1
index 5e2c64f..cf41ff1 100644
@@ -25,7 +25,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/riva/fbdev.c +0 -1
index 12af58c..26ffd76 100644
@@ -35,7 +35,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/s3c2410fb.c +0 -1
index fbc4118..b766bce 100644
@@ -76,7 +76,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/savage/savagefb_driver.c +0 -1
index 7353b4d..978ac49 100644
@@ -47,7 +47,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/sis/sis_main.c +6 -0
index c63c0e7..d5916e6 100644
@@ -45,7 +45,13 @@ #include <linux/spinlock.h>
 #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>
drivers/video/skeletonfb.c +0 -1
index 67f429e..bb96cb6 100644
@@ -47,7 +47,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
drivers/video/sun3fb.c +0 -1
index 9b36b9d..3373491 100644
@@ -31,7 +31,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/tdfxfb.c +0 -1
index 5e5328d..07edecb 100644
@@ -64,7 +64,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
drivers/video/tgafb.c +0 -1
index 6c2c78a..94fde62 100644
@@ -17,7 +17,6 @@ #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
drivers/video/tx3912fb.c +0 -1
index d904da4..07389ba 100644
@@ -14,7 +14,6 @@ #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
drivers/video/valkyriefb.c +0 -1
index 2bdeb4b..895ea90 100644
@@ -45,7 +45,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/vesafb.c +1 -1
index 5718924..2196448 100644
@@ -13,13 +13,13 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/screen_info.h>
 
 #include <video/vga.h>
 #include <asm/io.h>
drivers/video/vfb.c +0 -1
index d073ffb..a9b99b0 100644
@@ -15,7 +15,6 @@ #include <linux/kernel.h>
 #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>
drivers/video/vga16fb.c +1 -1
index 3c404c9..43d5a6d 100644
@@ -15,13 +15,13 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/screen_info.h>
 
 #include <asm/io.h>
 #include <video/vga.h>
drivers/video/virgefb.c +0 -1
index 5ea2345..6437895 100644
@@ -39,7 +39,6 @@ #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/zorro.h>
include/linux/console_struct.h +1 -0
index f8e5587..25423f7 100644
@@ -9,6 +9,7 @@
  * to achieve effects such as fast scrolling by changing the origin.
  */
 
+#include <linux/wait.h>
 #include <linux/vt.h>
 
 struct vt_struct;
include/linux/fb.h +0 -1
index 07a08e9..6776e42 100644
@@ -377,7 +377,6 @@ #ifdef __KERNEL__
 
 #include <linux/fs.h>
 #include <linux/init.h>
-#include <linux/tty.h>
 #include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/devfs_fs_kernel.h>
include/linux/tty.h +0 -11
index b3b807e..37937c8 100644
@@ -5,16 +5,6 @@ #define _LINUX_TTY_H
  * 'tty.h' defines some structures used by tty_io.c and some defines.
  */
 
-/*
- * These constants are also useful for user-level apps (e.g., VC
- * resizing).
- */
-#define MIN_NR_CONSOLES 1       /* must be at least 1 */
-#define MAX_NR_CONSOLES	63	/* serial lines start at 64 */
-#define MAX_NR_USER_CONSOLES 63	/* must be root to allocate above this */
-		/* Note: the ioctl VT_GETSTATE does not work for
-		   consoles 16 and higher (since it returns a short) */
-
 #ifdef __KERNEL__
 #include <linux/fs.h>
 #include <linux/major.h>

@@ -270,7 +260,6 @@ #define TTY_WRITE_FLUSH(tty) tty_write_f
 extern void tty_write_flush(struct tty_struct *);
 
 extern struct termios tty_std_termios;
-extern int fg_console, last_console, want_console;
 
 extern int kmsg_redirect;
include/linux/vt.h +10 -0
index 9f95b0b..8ab334a 100644
@@ -1,6 +1,16 @@
 #ifndef _LINUX_VT_H
 #define _LINUX_VT_H
 
+/*
+ * These constants are also useful for user-level apps (e.g., VC
+ * resizing).
+ */
+#define MIN_NR_CONSOLES 1       /* must be at least 1 */
+#define MAX_NR_CONSOLES	63	/* serial lines start at 64 */
+#define MAX_NR_USER_CONSOLES 63	/* must be root to allocate above this */
+		/* Note: the ioctl VT_GETSTATE does not work for
+		   consoles 16 and higher (since it returns a short) */
+
 /* 0x56 is 'V', to avoid collision with termios and kd */
 
 #define VT_OPENQRY	0x5600	/* find available vt */
include/linux/vt_kern.h +1 -0
index 940d026..918a297 100644
@@ -26,6 +26,7 @@ #endif
 
 extern void kd_mksound(unsigned int hz, unsigned int ticks);
 extern int kbd_rate(struct kbd_repeat *rep);
+extern int fg_console, last_console, want_console;
 
 /* console.c */

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642