* debian/config/i386/none/config.686,

debian/config/i386/none/config.686-bigmem: Remove options.
* debian/config/kernelarch-x86/config-arch-32: Add options.

svn path=/dists/trunk/linux-2.6/; revision=13653
This commit is contained in:
Bastian Blank 2009-05-20 15:39:29 +00:00
parent f7a0da726e
commit 5698e0acff
3 changed files with 4 additions and 24 deletions

View File

@ -1,11 +1,6 @@
##
## file: arch/x86/Kconfig
##
CONFIG_SMP=y
CONFIG_NR_CPUS=8
CONFIG_X86_MCE=y
CONFIG_X86_MCE_NONFATAL=m
CONFIG_X86_MCE_P4THERMAL=y
## choice: High Memory Support
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y

View File

@ -1,19 +1,6 @@
##
## file: arch/x86/Kconfig
##
CONFIG_SMP=y
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_VSMP is not set
# CONFIG_X86_ELAN is not set
# CONFIG_X86_RDC321X is not set
# CONFIG_X86_NUMAQ is not set
# CONFIG_X86_VISWS is not set
# CONFIG_X86_SUMMIT is not set
# CONFIG_X86_ES7000 is not set
CONFIG_NR_CPUS=32
CONFIG_X86_MCE=y
CONFIG_X86_MCE_NONFATAL=m
CONFIG_X86_MCE_P4THERMAL=y
## choice: High Memory Support
# CONFIG_NOHIGHMEM is not set
# CONFIG_HIGHMEM4G is not set

View File

@ -2,15 +2,13 @@
## file: arch/x86/Kconfig
##
# CONFIG_64BIT is not set
CONFIG_SMP=y
# CONFIG_SPARSE_IRQ is not set
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_ELAN is not set
# CONFIG_X86_RDC321X is not set
# CONFIG_X86_NUMAQ is not set
# CONFIG_X86_VISWS is not set
# CONFIG_X86_SUMMIT is not set
# CONFIG_X86_ES7000 is not set
CONFIG_VMI=y
CONFIG_NR_CPUS=32
CONFIG_X86_MCE_NONFATAL=m
CONFIG_X86_MCE_P4THERMAL=y
CONFIG_VM86=y
CONFIG_TOSHIBA=m
# CONFIG_X86_REBOOTFIXUPS is not set