diff options
| author | Dave Jones <davej@redhat.com> | 2011-08-09 19:32:10 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-08-09 19:32:10 -0400 |
| commit | 8ce7027f6178d22e8a5c81aa690e790c0a9c2846 (patch) | |
| tree | 093d04f79954c132268340fd2065ea8dea522ac5 /config-generic | |
| parent | 7a3b2689bf509717753eb3f7456b0b5419ff5b56 (diff) | |
| download | kernel-8ce7027f6178d22e8a5c81aa690e790c0a9c2846.tar.gz kernel-8ce7027f6178d22e8a5c81aa690e790c0a9c2846.tar.xz kernel-8ce7027f6178d22e8a5c81aa690e790c0a9c2846.zip | |
Split out the 32bit only options from x86-32
Remove unnecessary duplicates, consolidate.
This should reduce having to set the same option twice on 32/64.
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config-generic b/config-generic index f2a3e394e..f5347bcf0 100644 --- a/config-generic +++ b/config-generic @@ -3549,7 +3549,7 @@ CONFIG_MFD_WM8400=m # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_WM831X_I2C is not set -CONFIG_MFD_CS5535=m +# CONFIG_MFD_CS5535 is not set # # File systems @@ -4364,7 +4364,6 @@ CONFIG_RESOURCE_COUNTERS=y #FIXME: x86 generic? CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_I8K=m CONFIG_INPUT_APANEL=m # CONFIG_INTEL_MENLOW is not set @@ -4711,3 +4710,8 @@ CONFIG_TEST_KSTRTOX=m CONFIG_INTEL_MID_PTI=m CONFIG_IOMMU_SUPPORT=y + +CONFIG_SCHED_SMT=y +CONFIG_CC_STACKPROTECTOR=y +CONFIG_RELOCATABLE=y + |