From 4f860245a9fd41d35765a0f369ee34a499dc627d Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Mon, 10 Jan 2011 11:05:09 -0500
Subject: 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
---
 config-x86_64-generic | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config-x86_64-generic')

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
-- 
cgit