diff options
author | Justin M. Forbes <jforbes@redhat.com> | 2012-07-16 10:11:21 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@redhat.com> | 2012-07-16 10:11:21 -0500 |
commit | 99e9a629469bd6815b7cbe05fcf0bc605fbe5053 (patch) | |
tree | 1651a770c2ee1f45b580028915379e142c110462 /config-generic | |
parent | b36bdb940222088bfa0b6f171c14a9a8e0bbdabf (diff) | |
download | kernel-99e9a629469bd6815b7cbe05fcf0bc605fbe5053.tar.gz kernel-99e9a629469bd6815b7cbe05fcf0bc605fbe5053.tar.xz kernel-99e9a629469bd6815b7cbe05fcf0bc605fbe5053.zip |
Linux v3.5-rc7
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config-generic b/config-generic index 4022d3e5f..dda4b3092 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 @@ -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=m +# CONFIG_USB_UAS is not set # @@ -3915,7 +3915,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 |