* debian/config/amd64/config.amd64: Remove options.
* debian/config/kernelarch-x86/config-arch-64: Add further options. svn path=/dists/trunk/linux-2.6/; revision=13643
This commit is contained in:
parent
7a37133cb9
commit
91447d2bbc
|
@ -1,28 +1,3 @@
|
|||
##
|
||||
## file: arch/x86/Kconfig
|
||||
##
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=512
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_NUMA=y
|
||||
CONFIG_K8_NUMA=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
|
||||
##
|
||||
## file: arch/x86/Kconfig.cpu
|
||||
##
|
||||
## choice: Processor family
|
||||
# CONFIG_MK8 is not set
|
||||
# CONFIG_MPSC is not set
|
||||
CONFIG_GENERIC_CPU=y
|
||||
## end choice
|
||||
|
||||
##
|
||||
## file: drivers/acpi/Kconfig
|
||||
##
|
||||
CONFIG_ACPI_NUMA=y
|
||||
|
||||
##
|
||||
## file: drivers/char/Kconfig
|
||||
##
|
||||
|
@ -39,13 +14,3 @@ CONFIG_DIGIEPCA=m
|
|||
CONFIG_FB_MATROX_G=y
|
||||
CONFIG_FB_MATROX_MAVEN=m
|
||||
|
||||
##
|
||||
## file: mm/Kconfig
|
||||
##
|
||||
## choice: Memory model
|
||||
# CONFIG_FLATMEM_MANUAL is not set
|
||||
CONFIG_DISCONTIGMEM_MANUAL=y
|
||||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
## end choice
|
||||
CONFIG_MIGRATION=y
|
||||
|
||||
|
|
|
@ -2,14 +2,30 @@
|
|||
## file: arch/x86/Kconfig
|
||||
##
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_CALGARY_IOMMU=y
|
||||
CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
|
||||
CONFIG_AMD_IOMMU=y
|
||||
# CONFIG_AMD_IOMMU_STATS is not set
|
||||
# CONFIG_MAXSMP is not set
|
||||
CONFIG_NR_CPUS=512
|
||||
CONFIG_X86_MCE_INTEL=y
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_NUMA=y
|
||||
CONFIG_K8_NUMA=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
CONFIG_PCI_MMCONFIG=y
|
||||
|
||||
##
|
||||
## file: arch/x86/Kconfig.cpu
|
||||
##
|
||||
## choice: Processor family
|
||||
# CONFIG_MK8 is not set
|
||||
# CONFIG_MPSC is not set
|
||||
CONFIG_GENERIC_CPU=y
|
||||
## end choice
|
||||
|
||||
##
|
||||
## file: arch/x86/kernel/cpu/cpufreq/Kconfig
|
||||
##
|
||||
|
@ -20,3 +36,13 @@ CONFIG_X86_POWERNOW_K8=m
|
|||
##
|
||||
CONFIG_XEN_MAX_DOMAIN_MEMORY=32
|
||||
|
||||
##
|
||||
## file: mm/Kconfig
|
||||
##
|
||||
## choice: Memory model
|
||||
# CONFIG_FLATMEM_MANUAL is not set
|
||||
CONFIG_DISCONTIGMEM_MANUAL=y
|
||||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
## end choice
|
||||
CONFIG_MIGRATION=y
|
||||
|
||||
|
|
Loading…
Reference in New Issue