summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2012-07-23 08:28:32 -0500
committerJustin M. Forbes <jforbes@redhat.com>2012-07-23 08:28:32 -0500
commitdf9de7a9a3fa6083c890b254abf54b7960418cf0 (patch)
tree9f61c057bf432037fb00d166539ee279f3bb8bf8 /config-generic
parent0c1d59e4a4d1412998c7879a6924b75a938f81f2 (diff)
downloadkernel-df9de7a9a3fa6083c890b254abf54b7960418cf0.tar.gz
kernel-df9de7a9a3fa6083c890b254abf54b7960418cf0.tar.xz
kernel-df9de7a9a3fa6083c890b254abf54b7960418cf0.zip
Linux v3.5
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 b822a845f..8cd6a180f 100644
--- a/config-generic
+++ b/config-generic
@@ -1446,13 +1446,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
@@ -2985,7 +2985,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
#
@@ -3926,7 +3926,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