summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2012-07-17 09:40:10 -0500
committerJustin M. Forbes <jforbes@redhat.com>2012-07-17 09:40:10 -0500
commite8f3d1a1cb4856833d0afd7ec98a30eb89d5c580 (patch)
tree6e3f7314cebf0c5d621b2d9f268c507605e8a861 /config-generic
parent99e9a629469bd6815b7cbe05fcf0bc605fbe5053 (diff)
downloadkernel-e8f3d1a1cb4856833d0afd7ec98a30eb89d5c580.tar.gz
kernel-e8f3d1a1cb4856833d0afd7ec98a30eb89d5c580.tar.xz
kernel-e8f3d1a1cb4856833d0afd7ec98a30eb89d5c580.zip
Linux v3.5-rc7-25-ge5254a6
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 dda4b3092..4022d3e5f 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