The patch titled
tty: Remove include of screen_info.h from tty.h
has been added to the -mm tree. Its filename is
tty-remove-include-of-screen_infoh-from-ttyh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: tty: Remove include of screen_info.h from tty.h
From: Jon Smirl <jonsmir@xxxxxxxxx>
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.
Signed-off-by: Jon Smirl <jonsmir@xxxxxxxxx>
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/alpha/kernel/setup.c | 2 +-
arch/alpha/kernel/sys_sio.c | 2 +-
arch/arm/kernel/setup.c | 2 +-
arch/arm26/kernel/setup.c | 2 +-
arch/cris/kernel/setup.c | 2 +-
arch/i386/kernel/setup.c | 2 +-
arch/ia64/dig/setup.c | 2 +-
arch/ia64/kernel/setup.c | 2 +-
arch/ia64/sn/kernel/setup.c | 2 +-
arch/m32r/kernel/setup.c | 2 +-
arch/mips/kernel/setup.c | 2 +-
arch/mips/mips-boards/malta/malta_setup.c | 2 +-
arch/mips/sibyte/swarm/setup.c | 2 +-
arch/mips/sni/setup.c | 2 +-
arch/powerpc/kernel/ppc_ksyms.c | 2 +-
arch/powerpc/kernel/setup-common.c | 2 +-
arch/ppc/kernel/ppc_ksyms.c | 2 +-
arch/ppc/kernel/setup.c | 2 +-
arch/ppc/platforms/prep_setup.c | 2 +-
arch/sh/kernel/setup.c | 2 +-
arch/sh64/kernel/setup.c | 2 +-
arch/sh64/kernel/sh_ksyms.c | 2 +-
arch/sparc/kernel/setup.c | 2 +-
arch/sparc64/kernel/setup.c | 2 +-
arch/x86_64/kernel/early_printk.c | 2 +-
arch/x86_64/kernel/setup.c | 2 +-
arch/xtensa/kernel/setup.c | 2 +-
drivers/video/console/vgacon.c | 1 +
drivers/video/sis/sis_main.c | 2 +-
include/linux/tty.h | 1 -
30 files changed, 29 insertions(+), 29 deletions(-)
diff -puN arch/alpha/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/alpha/kernel/setup.c
--- a/arch/alpha/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/alpha/kernel/setup.c
@@ -19,7 +19,7 @@
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/delay.h>
#include <linux/config.h> /* CONFIG_ALPHA_LCA etc */
#include <linux/mc146818rtc.h>
diff -puN arch/alpha/kernel/sys_sio.c~tty-remove-include-of-screen_infoh-from-ttyh arch/alpha/kernel/sys_sio.c
--- a/arch/alpha/kernel/sys_sio.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/alpha/kernel/sys_sio.c
@@ -17,7 +17,7 @@
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/init.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <asm/compiler.h>
#include <asm/ptrace.h>
diff -puN arch/arm26/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/arm26/kernel/setup.c
--- a/arch/arm26/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/arm26/kernel/setup.c
@@ -18,7 +18,7 @@
#include <linux/console.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/init.h>
#include <linux/root_dev.h>
diff -puN arch/arm/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/arm/kernel/setup.c
--- a/arch/arm/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/arm/kernel/setup.c
@@ -18,7 +18,7 @@
#include <linux/console.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/init.h>
#include <linux/root_dev.h>
#include <linux/cpu.h>
diff -puN arch/cris/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/cris/kernel/setup.c
--- a/arch/cris/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/cris/kernel/setup.c
@@ -16,7 +16,7 @@
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <linux/seq_file.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/utsname.h>
#include <linux/pfn.h>
diff -puN arch/i386/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/i386/kernel/setup.c
@@ -27,7 +27,7 @@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/mmzone.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/ioport.h>
#include <linux/acpi.h>
#include <linux/apm_bios.h>
diff -puN arch/ia64/dig/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/ia64/dig/setup.c
--- a/arch/ia64/dig/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/ia64/dig/setup.c
@@ -15,7 +15,7 @@
#include <linux/kernel.h>
#include <linux/kdev_t.h>
#include <linux/string.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/console.h>
#include <linux/timex.h>
#include <linux/sched.h>
diff -puN arch/ia64/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/ia64/kernel/setup.c
@@ -36,7 +36,7 @@
#include <linux/seq_file.h>
#include <linux/string.h>
#include <linux/threads.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/dmi.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
diff -puN arch/ia64/sn/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/ia64/sn/kernel/setup.c
--- a/arch/ia64/sn/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/ia64/sn/kernel/setup.c
@@ -13,7 +13,7 @@
#include <linux/kernel.h>
#include <linux/kdev_t.h>
#include <linux/string.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/console.h>
#include <linux/timex.h>
#include <linux/sched.h>
diff -puN arch/m32r/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/m32r/kernel/setup.c
--- a/arch/m32r/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/m32r/kernel/setup.c
@@ -22,7 +22,7 @@
#include <linux/root_dev.h>
#include <linux/seq_file.h>
#include <linux/timex.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/cpu.h>
#include <linux/nodemask.h>
#include <linux/pfn.h>
diff -puN arch/mips/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/mips/kernel/setup.c
--- a/arch/mips/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/mips/kernel/setup.c
@@ -25,7 +25,7 @@
#include <linux/user.h>
#include <linux/utsname.h>
#include <linux/a.out.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/bootmem.h>
#include <linux/initrd.h>
#include <linux/major.h>
diff -puN arch/mips/mips-boards/malta/malta_setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/mips/mips-boards/malta/malta_setup.c
--- a/arch/mips/mips-boards/malta/malta_setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/mips/mips-boards/malta/malta_setup.c
@@ -20,7 +20,7 @@
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/pci.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#ifdef CONFIG_MTD
#include <linux/mtd/partitions.h>
diff -puN arch/mips/sibyte/swarm/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/mips/sibyte/swarm/setup.c
--- a/arch/mips/sibyte/swarm/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/mips/sibyte/swarm/setup.c
@@ -28,7 +28,7 @@
#include <linux/blkdev.h>
#include <linux/init.h>
#include <linux/kernel.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/initrd.h>
#include <asm/irq.h>
diff -puN arch/mips/sni/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/mips/sni/setup.c
--- a/arch/mips/sni/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/mips/sni/setup.c
@@ -19,7 +19,7 @@
#include <linux/pci.h>
#include <linux/console.h>
#include <linux/fb.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#ifdef CONFIG_ARC
#include <asm/arc/types.h>
diff -puN arch/powerpc/kernel/ppc_ksyms.c~tty-remove-include-of-screen_infoh-from-ttyh arch/powerpc/kernel/ppc_ksyms.c
--- a/arch/powerpc/kernel/ppc_ksyms.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/powerpc/kernel/ppc_ksyms.c
@@ -6,7 +6,7 @@
#include <linux/elfcore.h>
#include <linux/string.h>
#include <linux/interrupt.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/vt_kern.h>
#include <linux/nvram.h>
#include <linux/console.h>
diff -puN arch/powerpc/kernel/setup-common.c~tty-remove-include-of-screen_infoh-from-ttyh arch/powerpc/kernel/setup-common.c
--- a/arch/powerpc/kernel/setup-common.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/powerpc/kernel/setup-common.c
@@ -27,7 +27,7 @@
#include <linux/ioport.h>
#include <linux/console.h>
#include <linux/utsname.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/root_dev.h>
#include <linux/notifier.h>
#include <linux/cpu.h>
diff -puN arch/ppc/kernel/ppc_ksyms.c~tty-remove-include-of-screen_infoh-from-ttyh arch/ppc/kernel/ppc_ksyms.c
--- a/arch/ppc/kernel/ppc_ksyms.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/ppc/kernel/ppc_ksyms.c
@@ -6,7 +6,7 @@
#include <linux/elfcore.h>
#include <linux/string.h>
#include <linux/interrupt.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/vt_kern.h>
#include <linux/nvram.h>
#include <linux/console.h>
diff -puN arch/ppc/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/ppc/kernel/setup.c
--- a/arch/ppc/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/ppc/kernel/setup.c
@@ -12,7 +12,7 @@
#include <linux/delay.h>
#include <linux/initrd.h>
#include <linux/ide.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
diff -puN arch/ppc/platforms/prep_setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/ppc/platforms/prep_setup.c
--- a/arch/ppc/platforms/prep_setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/ppc/platforms/prep_setup.c
@@ -24,7 +24,7 @@
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/major.h>
#include <linux/interrupt.h>
#include <linux/reboot.h>
diff -puN arch/sh64/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/sh64/kernel/setup.c
--- a/arch/sh64/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/sh64/kernel/setup.c
@@ -36,7 +36,7 @@
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/config.h>
diff -puN arch/sh64/kernel/sh_ksyms.c~tty-remove-include-of-screen_infoh-from-ttyh arch/sh64/kernel/sh_ksyms.c
--- a/arch/sh64/kernel/sh_ksyms.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/sh64/kernel/sh_ksyms.c
@@ -19,7 +19,7 @@
#include <linux/in6.h>
#include <linux/interrupt.h>
#include <linux/smp_lock.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <asm/semaphore.h>
#include <asm/processor.h>
diff -puN arch/sh/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/sh/kernel/setup.c
--- a/arch/sh/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/sh/kernel/setup.c
@@ -10,7 +10,7 @@
* This file handles the architecture-dependent parts of initialization
*/
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/initrd.h>
diff -puN arch/sparc64/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/sparc64/kernel/setup.c
--- a/arch/sparc64/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/sparc64/kernel/setup.c
@@ -16,7 +16,7 @@
#include <asm/smp.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/delay.h>
#include <linux/config.h>
#include <linux/fs.h>
diff -puN arch/sparc/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/sparc/kernel/setup.c
--- a/arch/sparc/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/sparc/kernel/setup.c
@@ -17,7 +17,7 @@
#include <asm/smp.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/delay.h>
#include <linux/config.h>
#include <linux/fs.h>
diff -puN arch/x86_64/kernel/early_printk.c~tty-remove-include-of-screen_infoh-from-ttyh arch/x86_64/kernel/early_printk.c
--- a/arch/x86_64/kernel/early_printk.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/x86_64/kernel/early_printk.c
@@ -2,7 +2,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/string.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/fcntl.h>
diff -puN arch/x86_64/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/x86_64/kernel/setup.c
--- a/arch/x86_64/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/x86_64/kernel/setup.c
@@ -21,7 +21,7 @@
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/config.h>
diff -puN arch/xtensa/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh arch/xtensa/kernel/setup.c
--- a/arch/xtensa/kernel/setup.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/arch/xtensa/kernel/setup.c
@@ -18,7 +18,7 @@
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#include <linux/bootmem.h>
#include <linux/kernel.h>
diff -puN drivers/video/console/vgacon.c~tty-remove-include-of-screen_infoh-from-ttyh drivers/video/console/vgacon.c
--- a/drivers/video/console/vgacon.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/drivers/video/console/vgacon.c
@@ -48,6 +48,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 -puN drivers/video/sis/sis_main.c~tty-remove-include-of-screen_infoh-from-ttyh drivers/video/sis/sis_main.c
--- a/drivers/video/sis/sis_main.c~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/drivers/video/sis/sis_main.c
@@ -46,7 +46,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>
diff -puN include/linux/tty.h~tty-remove-include-of-screen_infoh-from-ttyh include/linux/tty.h
--- a/include/linux/tty.h~tty-remove-include-of-screen_infoh-from-ttyh
+++ a/include/linux/tty.h
@@ -12,7 +12,6 @@
#include <linux/workqueue.h>
#include <linux/tty_driver.h>
#include <linux/tty_ldisc.h>
-#include <linux/screen_info.h>
#include <linux/mutex.h>
#include <asm/system.h>
_
Patches currently in -mm which might be from jonsmir@xxxxxxxxx are
vt-remove-vt-specific-declarations-and-definitions-from.patch
tty-remove-include-of-screen_infoh-from-ttyh.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
