summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2014-02-24 19:09:24 +0100
committerJason Cooper <jason@lakedaemon.net>2014-02-24 19:48:56 +0100
commit5a51da2512513c5876340d7b4b84cc86ad1f4bfe (patch)
tree9d5ea8c8298945fc9e62dde7a2c62b8a641a0c89 /arch/arm/mach-kirkwood
parentARM: mvebu: Simplify headers and make local (diff)
downloadlinux-5a51da2512513c5876340d7b4b84cc86ad1f4bfe.tar.xz
linux-5a51da2512513c5876340d7b4b84cc86ad1f4bfe.zip
ARM: kirkwood: Remove redundant kexec code
The PCIe driver has been fully clock aware for quite a while. Remove the kexec code to enable the PCIe clock, since the PCIe driver will do the right thing. jac adds: [arnd]: fixes a build error when KEXEC is enabled and KIRKWOOD_LEGACY is not Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r--arch/arm/mach-kirkwood/board-dt.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index ec0702c02d6c..2801da49e2a3 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -19,7 +19,6 @@
#include <linux/of_platform.h>
#include <linux/dma-mapping.h>
#include <linux/irqchip.h>
-#include <linux/kexec.h>
#include <asm/hardware/cache-feroceon-l2.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -207,10 +206,6 @@ static void __init kirkwood_dt_init(void)
kirkwood_pm_init();
kirkwood_dt_eth_fixup();
-#ifdef CONFIG_KEXEC
- kexec_reinit = kirkwood_enable_pcie;
-#endif
-
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}