summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 07:04:59 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 07:07:33 -0400
commitf32bbb3ed5f46a5b3ac06af56898cd89978b4a3f (patch)
treef7b82f2224fac2ad7aff7915b26e65bbe426ce2c /config-generic
parent9cd5288f7382fa33c1624399e6ec8ca3faa30e99 (diff)
downloadkernel-f32bbb3ed5f46a5b3ac06af56898cd89978b4a3f.tar.gz
kernel-f32bbb3ed5f46a5b3ac06af56898cd89978b4a3f.tar.xz
kernel-f32bbb3ed5f46a5b3ac06af56898cd89978b4a3f.zip
Linux v3.11-716-gb3b4911
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic13
1 files changed, 9 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index df1f1202c..ffbae7926 100644
--- a/config-generic
+++ b/config-generic
@@ -3225,9 +3225,15 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_EHCI_MV is not set
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
+# CONFIG_USB_FOTG210_HCD is not set
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_HCD_PCI=y
# CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
# CONFIG_USB_OHCI_HCD_PLATFORM is not set
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_SL811_HCD=m
@@ -3236,8 +3242,6 @@ CONFIG_USB_SL811_HCD_ISO=y
# CONFIG_USB_R8A66597_HCD is not set
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FUSBH200_HCD=m
#
# USB Device Class drivers
@@ -3484,6 +3488,7 @@ CONFIG_USB_USS720=m
#
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -3578,6 +3583,7 @@ CONFIG_USB_PHY=y
# CONFIG_OMAP_USB2 is not set
# CONFIG_OMAP_USB3 is not set
# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_AM335X_PHY_USB is not set
# CONFIG_SAMSUNG_USBPHY is not set
# CONFIG_SAMSUNG_USB2PHY is not set
# CONFIG_SAMSUNG_USB3PHY is not set
@@ -3594,8 +3600,6 @@ CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_GADGET is not set
# CONFIG_USB_DWC3 is not set
# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_OXU210HP_HCD is not set
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_ISIGHTFW=m
@@ -3622,6 +3626,7 @@ CONFIG_RADIO_SI4713=m
CONFIG_USB_MR800=m
CONFIG_USB_STKWEBCAM=m
# CONFIG_USB_TEST is not set
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_U132_HCD=m
CONFIG_USB_UEAGLEATM=m