summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2012-07-03 11:04:52 -0500
committerJustin M. Forbes <jforbes@redhat.com>2012-07-03 11:04:52 -0500
commitf594e5be67180f7fb80a36b42affa1523b760bf0 (patch)
treeaa6196fdb2919f3b1d7abde32f7f9466a3d91dc5 /config-generic
parentcf4016063f4c70a0641198f02269a64be5d9ce4a (diff)
downloadkernel-f594e5be67180f7fb80a36b42affa1523b760bf0.tar.gz
kernel-f594e5be67180f7fb80a36b42affa1523b760bf0.tar.xz
kernel-f594e5be67180f7fb80a36b42affa1523b760bf0.zip
Linux v3.5-rc5-6-g9d4056a
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 08c28ba33..6b1c651df 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 is not set
+CONFIG_B43_DEBUG=y
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 is not set
+CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -2974,7 +2974,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 is not set
+CONFIG_USB_UAS=m
#
@@ -3915,7 +3915,7 @@ CONFIG_IBMASR=m
CONFIG_PM_DEBUG=y
CONFIG_PM_TRACE=y
CONFIG_PM_TRACE_RTC=y
-# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TEST_SUSPEND=y
CONFIG_PM_RUNTIME=y
# CONFIG_PM_OPP is not set
# CONFIG_PM_AUTOSLEEP is not set