diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-27 08:51:50 +0900 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-27 08:51:50 +0900 |
| commit | 8713181dced9b2d0c2a99613449b9e45b656df83 (patch) | |
| tree | 2f76c5e405ceec659145a73dc6ed1b20616a550b /arch/arm64/configs | |
| parent | 17e2aa01e461a3d3c4df3ea62aa3899df306d38c (diff) | |
| parent | 324e84cb9265120b49c4835ae850e4b83228aa73 (diff) | |
| download | blackbird-obmc-linux-8713181dced9b2d0c2a99613449b9e45b656df83.tar.gz blackbird-obmc-linux-8713181dced9b2d0c2a99613449b9e45b656df83.zip | |
Merge branch 'for-upstream/juno-pcie' of git://linux-arm.org/linux-ld into next/arm64
* 'for-upstream/juno-pcie' of git://linux-arm.org/linux-ld:
arm64: defconfig: Enable PCI generic host bridge by default
arm64: Juno: Add support for the PCIe host bridge on Juno R1
Documentation: of: Document the bindings used by Juno R1 PCIe host bridge
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 34d71dd86781..7c9455a91d53 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -49,6 +49,7 @@ CONFIG_ARCH_XGENE=y CONFIG_ARCH_ZYNQMP=y CONFIG_PCI=y CONFIG_PCI_MSI=y +CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_XGENE=y CONFIG_SMP=y CONFIG_PREEMPT=y |
