summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2013-05-20 21:05:52 -0400
committerKyle McMartin <kyle@mcmartin.ca>2013-05-20 22:46:23 -0400
commit78b8bdc3dd5671e7926bfb90c9e8056f7013494a (patch)
tree77807a61aba512827d988723546381bce16b026f /config-generic
parent85d2bdec2f695f254fff3682baf6387f66598fac (diff)
downloadkernel-78b8bdc3dd5671e7926bfb90c9e8056f7013494a.tar.gz
kernel-78b8bdc3dd5671e7926bfb90c9e8056f7013494a.tar.xz
kernel-78b8bdc3dd5671e7926bfb90c9e8056f7013494a.zip
Linux v3.10-rc2
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 7d162aa65..e57f70d2b 100644
--- a/config-generic
+++ b/config-generic
@@ -1570,13 +1570,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
@@ -3226,7 +3226,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
#
@@ -4240,7 +4240,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