summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-11-05 09:58:41 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-11-05 09:58:41 -0500
commita9993c78bec42a8df32c3cf167a10a357799cbb5 (patch)
treecdcfbd2441313dff9e32e098b44f07d364d88409 /config-generic
parentffb21c1f0a23a69f1e5dff3ec7e9d18734adbc4d (diff)
downloadkernel-a9993c78bec42a8df32c3cf167a10a357799cbb5.tar.gz
kernel-a9993c78bec42a8df32c3cf167a10a357799cbb5.tar.xz
kernel-a9993c78bec42a8df32c3cf167a10a357799cbb5.zip
Linux v3.7-rc4
- Disable debugging options. - Fix build break without CONFIG_EFI set (reported by Peter W. Bowey)
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 1ac354569..eb588f350 100644
--- a/config-generic
+++ b/config-generic
@@ -1513,13 +1513,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
@@ -3111,7 +3111,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
#
@@ -4077,7 +4077,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