summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2013-03-17 20:29:21 -0400
committerDave Jones <davej@redhat.com>2013-03-17 20:29:21 -0400
commit422866d063773df77176068a47341d9427b9b744 (patch)
treed70fd178ce12481dd27ccdd1e9041bb9094d7187 /config-generic
parent89e02ffdd4efb58badb456e33172a65b02c3e1a4 (diff)
downloadkernel-422866d063773df77176068a47341d9427b9b744.tar.gz
kernel-422866d063773df77176068a47341d9427b9b744.tar.xz
kernel-422866d063773df77176068a47341d9427b9b744.zip
Linux v3.9-rc3
merged: w1-fix-oops-when-w1_search-is-called-from.patch - Disable debugging options.
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 9c1cf4b94..52145225f 100644
--- a/config-generic
+++ b/config-generic
@@ -1554,13 +1554,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
@@ -3198,7 +3198,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
#
@@ -4190,7 +4190,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