summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-04-01 11:15:57 -0500
committerJustin M. Forbes <jforbes@redhat.com>2013-04-01 11:15:57 -0500
commit6e429107c2fa5b88eabcfda9db729eea93095534 (patch)
tree522d15ad107d1740cc744e545ee6413a7956e2c8 /config-generic
parent831cb39c244ee79e36eae1a98dbc96e1a53f7513 (diff)
downloadkernel-6e429107c2fa5b88eabcfda9db729eea93095534.tar.gz
kernel-6e429107c2fa5b88eabcfda9db729eea93095534.tar.xz
kernel-6e429107c2fa5b88eabcfda9db729eea93095534.zip
Linux v3.9-rc5
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic9
1 files changed, 5 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index adfb0b221..f6e472b89 100644
--- a/config-generic
+++ b/config-generic
@@ -1556,13 +1556,13 @@ CONFIG_B43_SDIO=y
CONFIG_B43_BCMA=y
# CONFIG_B43_BCMA_EXTRA is not set
CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
CONFIG_B43_PHY_LP=y
CONFIG_B43_PHY_N=y
CONFIG_B43_PHY_HT=y
# CONFIG_B43_FORCE_PIO is not set
CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -2152,6 +2152,7 @@ CONFIG_TELCLOCK=m
# Serial drivers
#
CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=32
@@ -3200,7 +3201,7 @@ CONFIG_USB_STORAGE_REALTEK=m
CONFIG_REALTEK_AUTOPM=y
CONFIG_USB_STORAGE_ENE_UB6250=m
# CONFIG_USB_LIBUSUAL is not set
-CONFIG_USB_UAS=m
+# CONFIG_USB_UAS is not set
#
@@ -4192,7 +4193,7 @@ CONFIG_IBMASR=m
CONFIG_PM_DEBUG=y
CONFIG_PM_TRACE=y
CONFIG_PM_TRACE_RTC=y
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_RUNTIME=y
# CONFIG_PM_OPP is not set
# CONFIG_PM_AUTOSLEEP is not set