summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-08-13 07:41:01 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-08-13 07:41:01 +0100
commita412315350b506878e6751c49d0fdbc71a123765 (patch)
tree8eb02d24de668e57133bc42e630c5ca023ae9a12 /config-generic
parent574fd2c3000f7d97cc63e8ced5ff416ee14042a2 (diff)
downloadkernel-a412315350b506878e6751c49d0fdbc71a123765.tar.gz
kernel-a412315350b506878e6751c49d0fdbc71a123765.tar.xz
kernel-a412315350b506878e6751c49d0fdbc71a123765.zip
- 3.17 ARMv7 updates
- Cleanup some old removed options - Disable legacy USB OTG (using new configfs equivilents)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic9
1 files changed, 2 insertions, 7 deletions
diff --git a/config-generic b/config-generic
index 8c7e94e1d..c61823b8c 100644
--- a/config-generic
+++ b/config-generic
@@ -1427,7 +1427,6 @@ CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_HWMON=y
CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBEVF=m
@@ -4003,7 +4002,6 @@ CONFIG_USB_CXACRU=m
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_CYTHERM is not set
CONFIG_USB_EMI26=m
-CONFIG_USB_ETH=m
CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
@@ -4042,16 +4040,13 @@ CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_U132_HCD=m
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
-
# CONFIG_USB_OTG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
#
# Sonics Silicon Backplane
#