diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 11:26:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 11:26:38 +0100 |
| commit | df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 (patch) | |
| tree | a091be1024bd76627f78e791e377126e47703b7b /arch/arm/configs | |
| parent | Merge branches 'debug', 'fixes', 'l2c' (early part), 'misc' and 'sa1100' into... (diff) | |
| parent | ARM: kprobes: Fix compilation error caused by superfluous '*' (diff) | |
| download | linux-df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1.tar.xz linux-df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 2328fe752e9c..bc393b7e5ece 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -338,6 +338,7 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_MVEBU=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_EXYNOS=y CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_EHCI_HCD_STI=y CONFIG_USB_EHCI_HCD_PLATFORM=y |