summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-10-29 12:44:37 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-10-29 12:44:37 -0400
commit5db35377dddcf7dc4a5126013ae8a1d1be1cad2f (patch)
treedf9fcd85098093021a120a61d944c9536bd5f349 /config-generic
parent6894720d057c5ecbf45432ed1d481cead161061f (diff)
downloadkernel-5db35377dddcf7dc4a5126013ae8a1d1be1cad2f.tar.gz
kernel-5db35377dddcf7dc4a5126013ae8a1d1be1cad2f.tar.xz
kernel-5db35377dddcf7dc4a5126013ae8a1d1be1cad2f.zip
Linux v3.12-rc7-9-gc9ca72f
- Fixes sg_open lock held when returning to userspace (rhbz 1018620) - Reenable debugging options.
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 315f40be3..3ad2e8563 100644
--- a/config-generic
+++ b/config-generic
@@ -1611,13 +1611,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
@@ -3415,7 +3415,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
#
@@ -4463,7 +4463,7 @@ CONFIG_PM_STD_PARTITION=""
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