The patch titled
vt: Remove VT-specific declarations and definitions from tty.h
has been removed from the -mm tree. Its filename is
vt-remove-vt-specific-declarations-and-definitions-from.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: vt: Remove VT-specific declarations and definitions from tty.h
From: Jon Smirl <jonsmir@xxxxxxxxx>
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@xxxxxxxx: fix alpha build]
Signed-off-by: Jon Smirl <jonsmir@xxxxxxxxx>
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/alpha/kernel/process.c | 1 +
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 +
74 files changed, 26 insertions(+), 78 deletions(-)
diff -puN arch/alpha/kernel/process.c~vt-remove-vt-specific-declarations-and-definitions-from arch/alpha/kernel/process.c
--- a/arch/alpha/kernel/process.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/arch/alpha/kernel/process.c
@@ -25,6 +25,7 @@
#include <linux/time.h>
#include <linux/major.h>
#include <linux/stat.h>
+#include <linux/vt.h>
#include <linux/mman.h>
#include <linux/elfcore.h>
#include <linux/reboot.h>
diff -puN arch/parisc/kernel/pdc_cons.c~vt-remove-vt-specific-declarations-and-definitions-from arch/parisc/kernel/pdc_cons.c
--- a/arch/parisc/kernel/pdc_cons.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/arch/parisc/kernel/pdc_cons.c
@@ -89,6 +89,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;
diff -puN drivers/video/68328fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/68328fb.c
--- a/drivers/video/68328fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/68328fb.c
@@ -32,7 +32,6 @@
#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>
diff -puN drivers/video/amifb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/amifb.c
--- a/drivers/video/amifb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/amifb.c
@@ -45,7 +45,6 @@
#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>
diff -puN drivers/video/arcfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/arcfb.c
--- a/drivers/video/arcfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/arcfb.c
@@ -39,7 +39,6 @@
#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>
diff -puN drivers/video/asiliantfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/asiliantfb.c
--- a/drivers/video/asiliantfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/asiliantfb.c
@@ -34,7 +34,6 @@
#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>
diff -puN drivers/video/atafb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/atafb.c
--- a/drivers/video/atafb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/atafb.c
@@ -53,7 +53,6 @@
#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>
diff -puN drivers/video/aty/aty128fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/aty/aty128fb.c
--- a/drivers/video/aty/aty128fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/aty/aty128fb.c
@@ -52,7 +52,6 @@
#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>
diff -puN drivers/video/aty/radeon_base.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/aty/radeon_base.c
--- a/drivers/video/aty/radeon_base.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/aty/radeon_base.c
@@ -58,7 +58,6 @@
#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>
diff -puN drivers/video/chipsfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/chipsfb.c
--- a/drivers/video/chipsfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/chipsfb.c
@@ -19,7 +19,6 @@
#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>
diff -puN drivers/video/cirrusfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/cirrusfb.c
--- a/drivers/video/cirrusfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/cirrusfb.c
@@ -41,7 +41,6 @@
#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>
diff -puN drivers/video/console/dummycon.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/console/dummycon.c
--- a/drivers/video/console/dummycon.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/console/dummycon.c
@@ -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>
diff -puN drivers/video/console/fbcon.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/console/fbcon.c
--- a/drivers/video/console/fbcon.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/console/fbcon.c
@@ -64,7 +64,6 @@
#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>
diff -puN drivers/video/console/mdacon.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/console/mdacon.c
--- a/drivers/video/console/mdacon.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/console/mdacon.c
@@ -31,7 +31,6 @@
#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>
diff -puN drivers/video/console/newport_con.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/console/newport_con.c
--- a/drivers/video/console/newport_con.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/console/newport_con.c
@@ -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>
diff -puN drivers/video/console/promcon.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/console/promcon.c
--- a/drivers/video/console/promcon.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/console/promcon.c
@@ -10,7 +10,6 @@
#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>
diff -puN drivers/video/console/softcursor.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/console/softcursor.c
--- a/drivers/video/console/softcursor.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/console/softcursor.c
@@ -10,7 +10,6 @@
#include <linux/module.h>
#include <linux/string.h>
-#include <linux/tty.h>
#include <linux/fb.h>
#include <linux/slab.h>
diff -puN drivers/video/console/sticon.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/console/sticon.c
--- a/drivers/video/console/sticon.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/console/sticon.c
@@ -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>
diff -puN drivers/video/console/vgacon.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/console/vgacon.c
--- a/drivers/video/console/vgacon.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/console/vgacon.c
@@ -38,7 +38,6 @@
#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>
diff -puN drivers/video/controlfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/controlfb.c
--- a/drivers/video/controlfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/controlfb.c
@@ -36,7 +36,6 @@
#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>
diff -puN drivers/video/cyber2000fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/cyber2000fb.c
--- a/drivers/video/cyber2000fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/cyber2000fb.c
@@ -41,7 +41,6 @@
#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>
diff -puN drivers/video/cyberfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/cyberfb.c
--- a/drivers/video/cyberfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/cyberfb.c
@@ -81,7 +81,6 @@
#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>
diff -puN drivers/video/dnfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/dnfb.c
--- a/drivers/video/dnfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/dnfb.c
@@ -2,7 +2,6 @@
#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>
diff -puN drivers/video/epson1355fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/epson1355fb.c
--- a/drivers/video/epson1355fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/epson1355fb.c
@@ -48,7 +48,6 @@
#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>
diff -puN drivers/video/fbcmap.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/fbcmap.c
--- a/drivers/video/fbcmap.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/fbcmap.c
@@ -13,7 +13,6 @@
#include <linux/string.h>
#include <linux/module.h>
-#include <linux/tty.h>
#include <linux/fb.h>
#include <linux/slab.h>
diff -puN drivers/video/fbmem.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/fbmem.c
--- a/drivers/video/fbmem.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/fbmem.c
@@ -23,7 +23,7 @@
#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>
diff -puN drivers/video/fbmon.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/fbmon.c
--- a/drivers/video/fbmon.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/fbmon.c
@@ -26,7 +26,6 @@
* for more details.
*
*/
-#include <linux/tty.h>
#include <linux/fb.h>
#include <linux/module.h>
#include <linux/pci.h>
diff -puN drivers/video/g364fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/g364fb.c
--- a/drivers/video/g364fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/g364fb.c
@@ -21,7 +21,6 @@
#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>
diff -puN drivers/video/geode/gx1fb_core.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/geode/gx1fb_core.c
--- a/drivers/video/geode/gx1fb_core.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/geode/gx1fb_core.c
@@ -15,7 +15,6 @@
#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>
diff -puN drivers/video/geode/gxfb_core.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/geode/gxfb_core.c
--- a/drivers/video/geode/gxfb_core.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/geode/gxfb_core.c
@@ -25,7 +25,6 @@
#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>
diff -puN drivers/video/hgafb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/hgafb.c
--- a/drivers/video/hgafb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/hgafb.c
@@ -36,7 +36,6 @@
#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>
diff -puN drivers/video/hitfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/hitfb.c
--- a/drivers/video/hitfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/hitfb.c
@@ -17,7 +17,6 @@
#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>
diff -puN drivers/video/hpfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/hpfb.c
--- a/drivers/video/hpfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/hpfb.c
@@ -11,7 +11,6 @@
#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>
diff -puN drivers/video/i810/i810_main.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/i810/i810_main.c
--- a/drivers/video/i810/i810_main.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/i810/i810_main.c
@@ -33,7 +33,6 @@
#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>
diff -puN drivers/video/igafb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/igafb.c
--- a/drivers/video/igafb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/igafb.c
@@ -33,7 +33,6 @@
#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>
diff -puN drivers/video/imacfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/imacfb.c
--- a/drivers/video/imacfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/imacfb.c
@@ -15,9 +15,9 @@
#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>
diff -puN drivers/video/imsttfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/imsttfb.c
--- a/drivers/video/imsttfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/imsttfb.c
@@ -21,7 +21,6 @@
#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>
diff -puN drivers/video/intelfb/intelfbdrv.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/intelfb/intelfbdrv.c
--- a/drivers/video/intelfb/intelfbdrv.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/intelfb/intelfbdrv.c
@@ -113,7 +113,6 @@
#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>
@@ -122,6 +121,7 @@
#include <linux/pci.h>
#include <linux/vmalloc.h>
#include <linux/pagemap.h>
+#include <linux/screen_info.h>
#include <asm/io.h>
diff -puN drivers/video/intelfb/intelfbhw.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/intelfb/intelfbhw.c
--- a/drivers/video/intelfb/intelfbhw.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/intelfb/intelfbhw.c
@@ -24,7 +24,6 @@
#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>
diff -puN drivers/video/kyro/fbdev.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/kyro/fbdev.c
--- a/drivers/video/kyro/fbdev.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/kyro/fbdev.c
@@ -16,7 +16,6 @@
#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>
diff -puN drivers/video/macfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/macfb.c
--- a/drivers/video/macfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/macfb.c
@@ -24,7 +24,6 @@
#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>
diff -puN drivers/video/matrox/matroxfb_base.h~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/matrox/matroxfb_base.h
--- a/drivers/video/matrox/matroxfb_base.h~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/matrox/matroxfb_base.h
@@ -30,7 +30,6 @@
#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>
diff -puN drivers/video/maxinefb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/maxinefb.c
--- a/drivers/video/maxinefb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/maxinefb.c
@@ -29,7 +29,6 @@
#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>
diff -puN drivers/video/modedb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/modedb.c
--- a/drivers/video/modedb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/modedb.c
@@ -12,7 +12,6 @@
*/
#include <linux/module.h>
-#include <linux/tty.h>
#include <linux/fb.h>
#include <linux/sched.h>
diff -puN drivers/video/neofb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/neofb.c
--- a/drivers/video/neofb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/neofb.c
@@ -59,7 +59,6 @@
#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>
diff -puN drivers/video/nvidia/nvidia.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/nvidia/nvidia.c
--- a/drivers/video/nvidia/nvidia.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/nvidia/nvidia.c
@@ -14,7 +14,6 @@
#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>
diff -puN drivers/video/offb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/offb.c
--- a/drivers/video/offb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/offb.c
@@ -17,7 +17,6 @@
#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>
diff -puN drivers/video/platinumfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/platinumfb.c
--- a/drivers/video/platinumfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/platinumfb.c
@@ -22,7 +22,6 @@
#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>
diff -puN drivers/video/pm2fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/pm2fb.c
--- a/drivers/video/pm2fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/pm2fb.c
@@ -33,7 +33,6 @@
#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>
diff -puN drivers/video/pm3fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/pm3fb.c
--- a/drivers/video/pm3fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/pm3fb.c
@@ -57,7 +57,6 @@
#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>
diff -puN drivers/video/pmag-aa-fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/pmag-aa-fb.c
--- a/drivers/video/pmag-aa-fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/pmag-aa-fb.c
@@ -29,7 +29,6 @@
#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>
diff -puN drivers/video/pvr2fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/pvr2fb.c
--- a/drivers/video/pvr2fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/pvr2fb.c
@@ -53,7 +53,6 @@
#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>
diff -puN drivers/video/q40fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/q40fb.c
--- a/drivers/video/q40fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/q40fb.c
@@ -14,7 +14,6 @@
#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>
diff -puN drivers/video/retz3fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/retz3fb.c
--- a/drivers/video/retz3fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/retz3fb.c
@@ -25,7 +25,6 @@
#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>
diff -puN drivers/video/riva/fbdev.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/riva/fbdev.c
--- a/drivers/video/riva/fbdev.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/riva/fbdev.c
@@ -34,7 +34,6 @@
#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>
diff -puN drivers/video/s3c2410fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/s3c2410fb.c
--- a/drivers/video/s3c2410fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/s3c2410fb.c
@@ -76,7 +76,6 @@
#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>
diff -puN drivers/video/S3triofb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/S3triofb.c
--- a/drivers/video/S3triofb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/S3triofb.c
@@ -28,7 +28,6 @@
#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>
diff -puN drivers/video/savage/savagefb_driver.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/savage/savagefb_driver.c
--- a/drivers/video/savage/savagefb_driver.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/savage/savagefb_driver.c
@@ -46,7 +46,6 @@
#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>
diff -puN drivers/video/sis/sis_main.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/sis/sis_main.c
--- a/drivers/video/sis/sis_main.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/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>
diff -puN drivers/video/skeletonfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/skeletonfb.c
--- a/drivers/video/skeletonfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/skeletonfb.c
@@ -47,7 +47,6 @@
#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>
diff -puN drivers/video/sun3fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/sun3fb.c
--- a/drivers/video/sun3fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/sun3fb.c
@@ -30,7 +30,6 @@
#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>
diff -puN drivers/video/tdfxfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/tdfxfb.c
--- a/drivers/video/tdfxfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/tdfxfb.c
@@ -63,7 +63,6 @@
#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>
diff -puN drivers/video/tgafb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/tgafb.c
--- a/drivers/video/tgafb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/tgafb.c
@@ -17,7 +17,6 @@
#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>
diff -puN drivers/video/tx3912fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/tx3912fb.c
--- a/drivers/video/tx3912fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/tx3912fb.c
@@ -14,7 +14,6 @@
#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>
diff -puN drivers/video/valkyriefb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/valkyriefb.c
--- a/drivers/video/valkyriefb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/valkyriefb.c
@@ -44,7 +44,6 @@
#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>
diff -puN drivers/video/vesafb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/vesafb.c
--- a/drivers/video/vesafb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/vesafb.c
@@ -13,13 +13,13 @@
#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>
diff -puN drivers/video/vfb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/vfb.c
--- a/drivers/video/vfb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/vfb.c
@@ -15,7 +15,6 @@
#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>
diff -puN drivers/video/vga16fb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/vga16fb.c
--- a/drivers/video/vga16fb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/vga16fb.c
@@ -15,13 +15,13 @@
#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>
diff -puN drivers/video/virgefb.c~vt-remove-vt-specific-declarations-and-definitions-from drivers/video/virgefb.c
--- a/drivers/video/virgefb.c~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/drivers/video/virgefb.c
@@ -39,7 +39,6 @@
#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>
diff -puN include/linux/console_struct.h~vt-remove-vt-specific-declarations-and-definitions-from include/linux/console_struct.h
--- a/include/linux/console_struct.h~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/include/linux/console_struct.h
@@ -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;
diff -puN include/linux/fb.h~vt-remove-vt-specific-declarations-and-definitions-from include/linux/fb.h
--- a/include/linux/fb.h~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/include/linux/fb.h
@@ -377,7 +377,6 @@ struct fb_cursor {
#include <linux/fs.h>
#include <linux/init.h>
-#include <linux/tty.h>
#include <linux/device.h>
#include <linux/workqueue.h>
#include <linux/notifier.h>
diff -puN include/linux/tty.h~vt-remove-vt-specific-declarations-and-definitions-from include/linux/tty.h
--- a/include/linux/tty.h~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/include/linux/tty.h
@@ -5,16 +5,6 @@
* '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 @@ struct tty_struct {
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;
diff -puN include/linux/vt.h~vt-remove-vt-specific-declarations-and-definitions-from include/linux/vt.h
--- a/include/linux/vt.h~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/include/linux/vt.h
@@ -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 */
diff -puN include/linux/vt_kern.h~vt-remove-vt-specific-declarations-and-definitions-from include/linux/vt_kern.h
--- a/include/linux/vt_kern.h~vt-remove-vt-specific-declarations-and-definitions-from
+++ a/include/linux/vt_kern.h
@@ -26,6 +26,7 @@
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 */
_
Patches currently in -mm which might be from jonsmir@xxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
