Signed-off-by: Andrew Morton --- arch/i386/Kconfig | 9 +++++++++ init/Kconfig | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff -puN arch/i386/Kconfig~x86_64-mm-i386-move-vm86-config arch/i386/Kconfig --- devel/arch/i386/Kconfig~x86_64-mm-i386-move-vm86-config 2006-06-09 15:17:36.000000000 -0700 +++ devel-akpm/arch/i386/Kconfig 2006-06-09 15:17:36.000000000 -0700 @@ -318,6 +318,15 @@ config X86_MCE_P4THERMAL Enabling this feature will cause a message to be printed when the P4 enters thermal throttling. +config VM86 + default y + bool "Enable VM86 support" if EMBEDDED + help + This option is required by programs like DOSEMU to run 16-bit legacy + code on X86 processors. It also may be needed by software like + XFree86 to initialize some video cards via BIOS. Disabling this + option saves about 6k. + config TOSHIBA tristate "Toshiba Laptop support" ---help--- diff -puN init/Kconfig~x86_64-mm-i386-move-vm86-config init/Kconfig --- devel/init/Kconfig~x86_64-mm-i386-move-vm86-config 2006-06-09 15:17:36.000000000 -0700 +++ devel-akpm/init/Kconfig 2006-06-09 15:17:36.000000000 -0700 @@ -242,16 +242,6 @@ config UID16 help This enables the legacy 16-bit UID syscall wrappers. -config VM86 - depends X86 - default y - bool "Enable VM86 support" if EMBEDDED - help - This option is required by programs like DOSEMU to run 16-bit legacy - code on X86 processors. It also may be needed by software like - XFree86 to initialize some video cards via BIOS. Disabling this - option saves about 6k. - config CC_OPTIMIZE_FOR_SIZE bool "Optimize for size (Look out for broken compilers!)" default y _