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-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-generic')
-rw-r--r-- | config-x86-generic | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic index d47bd0a07..eb8a16c9c 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -526,3 +526,5 @@ CONFIG_PCH_GBE=m CONFIG_PCH_PHUB=m CONFIG_JUMP_LABEL=y + +CONFIG_X86_32_IRIS=m |