diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:45:43 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:45:43 +0100 |
| commit | d4aaef61998b4e671ea395279f7d32939e4d6bb0 (patch) | |
| tree | db69d823467ac6e52804aae7ccb4c8c0be127acd /arch/arm | |
| parent | 0a7fe6b478bc79bac0657001663e32d5bbc57b9a (diff) | |
| parent | 1d5b8b621e31e46f82ed9254af9cd1faa5b81dbb (diff) | |
| download | linux-d4aaef61998b4e671ea395279f7d32939e4d6bb0.tar.gz linux-d4aaef61998b4e671ea395279f7d32939e4d6bb0.tar.bz2 linux-d4aaef61998b4e671ea395279f7d32939e4d6bb0.zip | |
Merge tag 'sti-defconfig-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/defconfig
Pull "STi defconfig updates for v3.19" from Maxime Coquelin:
Highlights:
-----------
- Enable ST EHCI and OHCI USB drivers
- Enable STiH416 and STiH415 USB2 PHY driver
* tag 'sti-defconfig-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux-sti:
ARM: multi_v7_defconfig: Enable stih415/6 usb2 phy driver.
ARM: multi_v7_defconfig: Enable st ohci and ehci HCD drivers.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index b4331cf88db1..2826448d4a57 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -330,9 +330,11 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_MVEBU=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_TEGRA=y +CONFIG_USB_EHCI_HCD_STI=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_ISP1760_HCD=y CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_STI=y CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y @@ -436,6 +438,7 @@ CONFIG_PWM_VT8500=y CONFIG_OMAP_USB2=y CONFIG_TI_PIPE3=y CONFIG_PHY_MIPHY365X=y +CONFIG_PHY_STIH41X_USB=y CONFIG_PHY_SUN4I_USB=y CONFIG_EXT4_FS=y CONFIG_AUTOFS4_FS=y |