diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 15:16:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 15:16:02 +0200 |
| commit | 772a7f22978bccb88b8ba2685a9f37648da615fc (patch) | |
| tree | 9df585e01faae9aff0a5998379547c132ed638c7 /arch/arm/configs | |
| parent | fa3533e778d9189d242929a795b438587df69110 (diff) | |
| parent | 0992b2f16bc055df4fcd30558653490912637edd (diff) | |
| download | linux-772a7f22978bccb88b8ba2685a9f37648da615fc.tar.bz2 | |
Merge tag 'omap-for-v4.8/defconfig-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig
Merge "omap2plus_defconfig fix for v4.8 merge window" from Tony Lindgren:
A defconfig update for omap2plus_defconfig to fix changed USB
Kconfig dependencies for v4.8 merge window. Otherwise things
like USB Ethernet on omap3 beagle, omap4 panda and omap5-uevm
won't work without manual configuration.
* tag 'omap-for-v4.8/defconfig-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: Fix USB selection to keep Ethernet working
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index ac717cccd2b5..487c6c3b13fd 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -355,11 +355,13 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_WDM=m CONFIG_USB_STORAGE=m CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_MUSB_OMAP2PLUS=m CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_DSPS=m CONFIG_USB_INVENTRA_DMA=y CONFIG_USB_TI_CPPI41_DMA=y +CONFIG_USB_TUSB_OMAP_DMA=y CONFIG_USB_DWC3=m CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y @@ -367,7 +369,8 @@ CONFIG_USB_SERIAL_SIMPLE=m CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_TEST=m -CONFIG_AM335X_PHY_USB=y +CONFIG_NOP_USB_XCEIV=m +CONFIG_AM335X_PHY_USB=m CONFIG_TWL6030_USB=m CONFIG_USB_GADGET=m CONFIG_USB_GADGET_DEBUG=y |