diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 11:42:35 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 11:42:35 -0400 |
| commit | e45a70be69b352f2fd3c90c4bd33479242f20591 (patch) | |
| tree | 6105e6a4bdc6af1fddc4d9d30e63c2aa522ce731 | |
| parent | 8f8aab65459e46f3300f66335b6d001389883597 (diff) | |
| parent | a03bd5735dfa87a5db585e162eda00794690c534 (diff) | |
Merge tag 'renesas-arm64-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/arm64
Merge "Renesas ARM64 Based SoC Defconfig Updates for v4.7" from Simon Horman:
* Add Renesas R-Car USB 3.0 driver support
* tag 'renesas-arm64-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm64: defconfig: Add Renesas R-Car USB 3.0 driver support
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index a0c303a1d3cc..378ad366d9f7 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig | |||
| @@ -213,7 +213,7 @@ CONFIG_SND_SOC_AK4613=y | |||
| 213 | CONFIG_USB=y | 213 | CONFIG_USB=y |
| 214 | CONFIG_USB_OTG=y | 214 | CONFIG_USB_OTG=y |
| 215 | CONFIG_USB_XHCI_HCD=y | 215 | CONFIG_USB_XHCI_HCD=y |
| 216 | CONFIG_USB_XHCI_PLATFORM=y | 216 | CONFIG_USB_XHCI_RCAR=y |
| 217 | CONFIG_USB_EHCI_HCD=y | 217 | CONFIG_USB_EHCI_HCD=y |
| 218 | CONFIG_USB_EHCI_MSM=y | 218 | CONFIG_USB_EHCI_MSM=y |
| 219 | CONFIG_USB_EHCI_HCD_PLATFORM=y | 219 | CONFIG_USB_EHCI_HCD_PLATFORM=y |