summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-03-08 08:43:55 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-03-08 08:43:55 -0500
commit194fd44ead98035b72a40599458a505db29d9fab (patch)
tree471044147a149e14fa66c14a6f55a836c40af347 /config-generic
parent4bd0ec95ad9d61233a9c918e3c7fe65a81da8d73 (diff)
downloadkernel-194fd44ead98035b72a40599458a505db29d9fab.tar.gz
kernel-194fd44ead98035b72a40599458a505db29d9fab.tar.xz
kernel-194fd44ead98035b72a40599458a505db29d9fab.zip
Linux v3.9-rc1-211-g47b3bc9
- Reenable debugging options. - CVE-2013-1828 sctp: SCTP_GET_ASSOC_STATS stack buffer overflow (rhbz 919315 919316)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic10
1 files changed, 6 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index 33d389002..599ffa376 100644
--- a/config-generic
+++ b/config-generic
@@ -1554,13 +1554,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
@@ -3197,7 +3197,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
#
@@ -3363,6 +3363,7 @@ CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -3708,6 +3709,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
CONFIG_BEFS_FS=m
@@ -4187,7 +4189,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