]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: kirkwood: Remove redundant kexec code
authorAndrew Lunn <andrew@lunn.ch>
Mon, 24 Feb 2014 18:09:24 +0000 (19:09 +0100)
committerJason Cooper <jason@lakedaemon.net>
Mon, 24 Feb 2014 18:48:56 +0000 (18:48 +0000)
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>
arch/arm/mach-kirkwood/board-dt.c

index ec0702c02d6c9e802cb7104110588863353912ac..2801da49e2a36bfea53cf1fd5a084c51dbac42a6 100644 (file)
@@ -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);
 }