summaryrefslogtreecommitdiff
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-10 21:50:49 -0700
committerOlof Johansson <olof@lixom.net>2013-06-10 22:00:59 -0700
commited3d27feccacf38299c244e9c0912e884a752b1d (patch)
tree70242a927d8e60f43b33a000a2cd759a6eddffdc /arch/arm/mach-kirkwood
parente56c60c374bbcd343ed286c713116056bf3d6d36 (diff)
parent6bd98481ab346964344e05a041f35ff83cb3d00c (diff)
Merge tag 'pcie_kw-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc
From Jason Cooper: mvebu pcie driver (kirkwood) for v3.11 (round 2) - kirkwood - migrate Netgear ReadyNAS Duo v2 to pcie DT init * tag 'pcie_kw-3.11-2' of git://git.infradead.org/users/jcooper/linux: arm: kirkwood: NETGEAR ReadyNAS Duo v2 init PCIe via DT Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r--arch/arm/mach-kirkwood/board-readynas.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/board-readynas.c b/arch/arm/mach-kirkwood/board-readynas.c
index fb42c20e273f..341b82d9cadb 100644
--- a/arch/arm/mach-kirkwood/board-readynas.c
+++ b/arch/arm/mach-kirkwood/board-readynas.c
@@ -24,5 +24,4 @@ static struct mv643xx_eth_platform_data netgear_readynas_ge00_data = {
void __init netgear_readynas_init(void)
{
kirkwood_ge00_init(&netgear_readynas_ge00_data);
- kirkwood_pcie_init(KW_PCIE0);
}