summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/multi_v7_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-04-26 13:11:15 +0200
committerArnd Bergmann <arnd@arndb.de>2016-04-26 13:11:15 +0200
commitd528c74e69b517c578fd021062ac7868e1ad5921 (patch)
tree77dfc859a0bcb173e61a44644a12738d201df45d /arch/arm/configs/multi_v7_defconfig
parent58e696d111ff3c111118126d9ffd790517acb131 (diff)
parent350a73b4f896e620216d8e9429bbac16d89da8b0 (diff)
downloadblackbird-op-linux-d528c74e69b517c578fd021062ac7868e1ad5921.tar.gz
blackbird-op-linux-d528c74e69b517c578fd021062ac7868e1ad5921.zip
Merge tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Merge "Renesas ARM Based SoC Pci Defconfig Updates for v4.7" from Simon Horman: * Remove Gen2 designation from Kconfig for R-Car PCIE driver * tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: PCI: rcar-pcie: Remove Gen2 designation from Kconfig
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index ca0f4f1bdaf4..915fbf595414 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -119,7 +119,7 @@ CONFIG_PCI_MSI=y
CONFIG_PCI_MVEBU=y
CONFIG_PCI_TEGRA=y
CONFIG_PCI_RCAR_GEN2=y
-CONFIG_PCI_RCAR_GEN2_PCIE=y
+CONFIG_PCIE_RCAR=y
CONFIG_PCIEPORTBUS=y
CONFIG_SMP=y
CONFIG_NR_CPUS=16
OpenPOWER on IntegriCloud