diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 23:56:11 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 23:56:11 +0200 |
| commit | 35e53e33deb209a7ac83f1cfad22e60bccb66031 (patch) | |
| tree | 5bf1be854a7d37cab4e58714885bc69390950e0c /arch/arm/configs | |
| parent | d268d2da2af6a37926b1f14c415bf9c04ad0d252 (diff) | |
| parent | 81b1f69e0185b1e9053ae5ce3948967ccaa29bba (diff) | |
| download | linux-35e53e33deb209a7ac83f1cfad22e60bccb66031.tar.bz2 | |
Merge tag 'keystone_config_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig
Pull "ARM: config: Add CONFIG_NOP_USB_XCEIV" from Santosh Shilimkar:
Keystone usb phy needs CONFIG_NOP_USB_XCEIV to be enabled.
* tag 'keystone_config_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: keystone: defconfig: Fix USB configuration
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/keystone_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index 71b42e66488a..78cd2f197e01 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -161,6 +161,7 @@ CONFIG_USB_MON=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_DWC3=y +CONFIG_NOP_USB_XCEIV=y CONFIG_KEYSTONE_USB_PHY=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y |