summaryrefslogtreecommitdiffstats
path: root/config-x86-32-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-10-30 15:49:07 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-10-30 15:49:07 -0400
commitede75f6f8f84592ab0a2440327a0dd92912171f7 (patch)
treec83b220c63c85d04820034ffda7fac25bdc60481 /config-x86-32-generic
parent23aad7f77fd1d1fd894c77db19f057728acacb02 (diff)
downloadkernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.tar.gz
kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.tar.xz
kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.zip
Update config options for 3.7
- Fix module blacklist patch to not leak a reference to the blacklist keyring
Diffstat (limited to 'config-x86-32-generic')
-rw-r--r--config-x86-32-generic4
1 files changed, 4 insertions, 0 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic
index b1a04993a..1216d47e6 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -190,6 +190,7 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
# CONFIG_X86_INTEL_MID is not set
CONFIG_MFD_CS5535=m
+# CONFIG_MFD_SYSCON is not set
# I2O enabled only for 32-bit x86, disabled for PAE kernel
CONFIG_I2O=m
@@ -211,5 +212,8 @@ CONFIG_I2O_BUS=m
# CONFIG_GEOS is not set
# CONFIG_NET5501 is not set
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_GPIO_SODAVILLE is not set
+# CONFIG_GPIO_ADNP is not set
# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_RTC_DRV_SNVS is not set