summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2012-10-15 09:16:42 -0500
committerJustin M. Forbes <jforbes@redhat.com>2012-10-15 09:16:42 -0500
commitcee1c9b0caa887acfe1412d7e36100bcd7622891 (patch)
tree869c3339a4b1520532a17ad686b9386ac9f4efd3 /config-generic
parentd5a57ddec907177e73c528038b520bc25cee5e52 (diff)
downloadkernel-cee1c9b0caa887acfe1412d7e36100bcd7622891.tar.gz
kernel-cee1c9b0caa887acfe1412d7e36100bcd7622891.tar.xz
kernel-cee1c9b0caa887acfe1412d7e36100bcd7622891.zip
Linux 3.7-rc1
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic8
1 files changed, 4 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index 9b63e75f9..8f795f5d5 100644
--- a/config-generic
+++ b/config-generic
@@ -1456,13 +1456,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
@@ -3028,7 +3028,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
#
@@ -3981,7 +3981,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