summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-01-18 14:47:39 -0600
committerJustin M. Forbes <jforbes@redhat.com>2013-01-18 14:47:39 -0600
commit1d0a7626b17ff7ac7dea19d939a8b6bdcbc0b8c9 (patch)
tree199296555713d260391ca6c6018556db9e101673 /config-generic
parent182801502c034671a43ab0ae2cffb99de1ab5cca (diff)
downloadkernel-1d0a7626b17ff7ac7dea19d939a8b6bdcbc0b8c9.tar.gz
kernel-1d0a7626b17ff7ac7dea19d939a8b6bdcbc0b8c9.tar.xz
kernel-1d0a7626b17ff7ac7dea19d939a8b6bdcbc0b8c9.zip
Linux v3.8-rc4
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 ca7e7fb6e..e06358190 100644
--- a/config-generic
+++ b/config-generic
@@ -1533,13 +1533,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
@@ -3153,7 +3153,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
#
@@ -4135,7 +4135,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