diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 00:05:59 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 00:05:59 +0200 |
| commit | dafa5d395244c218f3a3732a113a98ae716eaa2f (patch) | |
| tree | 2fa95ba558348ce271050ee9639de522a569635d /arch/arm64/configs | |
| parent | 23d4635ec9fa729921a7295cc0649d42d28d1096 (diff) | |
| parent | cfa1c7c8af9fe956d446a7d5b8ed3a895496884c (diff) | |
Merge tag 'mvebu-defconfig64-4.9-1' of git://git.infradead.org/linux-mvebu into next/arm64
Pull "mvebu defconfig64 for 4.9 (part 1)" from Gregory CLEMENT:
- add PCIe driver for Aardvark for Armada 3700
- enable xhci-platform for A7K/A8K
* tag 'mvebu-defconfig64-4.9-1' of git://git.infradead.org/linux-mvebu:
arm64: configs: enable PCIe driver for Aardvark
arm64: defconfig: enable xhci-platform
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 8fa040dba403..64990a69e99d 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -61,6 +61,7 @@ CONFIG_ARCH_ZYNQMP=y CONFIG_PCI=y CONFIG_PCI_MSI=y CONFIG_PCI_IOV=y +CONFIG_PCI_AARDVARK=y CONFIG_PCIE_RCAR=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_XGENE=y @@ -309,6 +310,7 @@ CONFIG_SND_SOC_AK4613=y CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y CONFIG_USB_XHCI_RCAR=y CONFIG_USB_EHCI_EXYNOS=y CONFIG_USB_XHCI_TEGRA=y |