summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2013-07-17 16:56:58 -0400
committerKyle McMartin <kmcmarti@redhat.com>2013-07-17 16:56:58 -0400
commite9ba93a97a38b0b1a0593d9cd625c5aebd4fb222 (patch)
treec8b3b37d092b77c34fc3bc54a0040ba4d1fc052b /config-generic
parentdcf602e7e85a77ff5943c167b364623cb3a77f0a (diff)
downloadkernel-e9ba93a97a38b0b1a0593d9cd625c5aebd4fb222.tar.gz
kernel-e9ba93a97a38b0b1a0593d9cd625c5aebd4fb222.tar.xz
kernel-e9ba93a97a38b0b1a0593d9cd625c5aebd4fb222.zip
Linux 3.11-rc1-git1
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 0baf8870d..8adcbaf63 100644
--- a/config-generic
+++ b/config-generic
@@ -1592,13 +1592,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
@@ -3265,7 +3265,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
#
@@ -4287,7 +4287,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