summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-04-29 18:32:27 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-04-29 19:38:36 -0400
commit4894d6ca8866c61b6a8e2a9fd2dbbcef0bddf15e (patch)
tree30fc5947a8e1b6d9b42f1d77ed3444c50fcfaab9 /config-generic
parent4cec57911371abaae8d057d725431be0be62bb27 (diff)
downloadkernel-4894d6ca8866c61b6a8e2a9fd2dbbcef0bddf15e.tar.gz
kernel-4894d6ca8866c61b6a8e2a9fd2dbbcef0bddf15e.tar.xz
kernel-4894d6ca8866c61b6a8e2a9fd2dbbcef0bddf15e.zip
Linux v3.9-2154-gec25e24
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic15
1 files changed, 15 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 923696416..6ef80f2f8 100644
--- a/config-generic
+++ b/config-generic
@@ -2130,6 +2130,7 @@ CONFIG_N_HDLC=m
CONFIG_N_GSM=m
# CONFIG_TRACE_SINK is not set
# CONFIG_STALDRV is not set
+# CONFIG_DUMMY_IRQ is not set
# CONFIG_IBM_ASM is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -2411,6 +2412,7 @@ CONFIG_W1_MASTER_DS1WM=m
CONFIG_W1_SLAVE_THERM=m
CONFIG_W1_SLAVE_SMEM=m
CONFIG_W1_SLAVE_DS2408=m
+# CONFIG_W1_SLAVE_DS2408_READBACK is not set
CONFIG_W1_SLAVE_DS2413=m
CONFIG_W1_SLAVE_DS2423=m
CONFIG_W1_SLAVE_DS2431=m
@@ -3146,6 +3148,7 @@ CONFIG_USB_SUPPORT=y
# Deprecated.
# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DYNAMIC_MINORS is not set
CONFIG_USB_SUSPEND=y
@@ -3453,6 +3456,7 @@ CONFIG_USB_SERIAL_MCT_U232=m
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7715_PARPORT=y
# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_WISHBONE is not set
# CONFIG_USB_SERIAL_ZTE is not set
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_USB_SERIAL_MOTOROLA=m
@@ -3495,9 +3499,16 @@ CONFIG_USB_ADUTUX=m
CONFIG_USB_SEVSEG=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_APPLEDISPLAY=m
+
+# Physical Layer USB driver
+CONFIG_USB_PHY=y
+
# CONFIG_OMAP_USB2 is not set
# CONFIG_OMAP_USB3 is not set
# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_SAMSUNG_USBPHY is not set
+# CONFIG_SAMSUNG_USB2PHY is not set
+# CONFIG_SAMSUNG_USB3PHY is not set
CONFIG_USB_RCAR_PHY=m
CONFIG_USB_ATM=m
CONFIG_USB_CXACRU=m
@@ -3545,6 +3556,8 @@ CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
CONFIG_USB_ZERO=m
+# CONFIG_USB_DWC2 is not set
+
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
# CONFIG_USB_ISP1301 is not set
@@ -4006,6 +4019,8 @@ CONFIG_AUDITSYSCALL=y
# http://lists.fedoraproject.org/pipermail/kernel/2013-February/004125.html
CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
+# CONFIG_SSBI is not set
+
#
# Cryptographic options
#