diff options
author | Kyle McMartin <kyle@redhat.com> | 2011-01-10 11:05:09 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@redhat.com> | 2011-01-10 11:05:09 -0500 |
commit | 4f860245a9fd41d35765a0f369ee34a499dc627d (patch) | |
tree | 8ff7ac6be9dd548948966c07ab886336258b89f5 /config-x86_64-generic | |
parent | 482441b552e5984853ef8c4570d6cf3a914838b0 (diff) | |
download | kernel-4f860245a9fd41d35765a0f369ee34a499dc627d.tar.gz kernel-4f860245a9fd41d35765a0f369ee34a499dc627d.tar.xz kernel-4f860245a9fd41d35765a0f369ee34a499dc627d.zip |
Branch for 2.6.38
- Rebase trivial patches.
- Switch debug configs back on.
- config changes:
DEBUG_SET_MODULE_RONX=y
B43_PHY_N=y
RT2800USB_RT33XX=y |
RT2800PCI_RT33XX=y | experimental
WL12XX=m
RTL8192CE=m
CAN_SLCAN=m
SCHED_AUTOGROUP=n
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r-- | config-x86_64-generic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index b583f7759..11bf9c584 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -13,9 +13,10 @@ CONFIG_X86_CPUID=y CONFIG_MTRR=y CONFIG_NUMA=y CONFIG_K8_NUMA=y +CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_NR_CPUS=256 +CONFIG_NR_CPUS=512 CONFIG_X86_POWERNOW_K8=m CONFIG_X86_P4_CLOCKMOD=m CONFIG_IA32_EMULATION=y |