diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:33 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:33 +0100 |
| commit | e9bcea6f7eff94e886e3f6a1ef2c7010cd8bf89b (patch) | |
| tree | 5a73d4d392a1fe078b33e498e6fe2c68ead238cb /arch/arm/mach-prima2 | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff) | |
| parent | 9905bae08894b9c4af999ee4658c3e68455b98bf (diff) | |
Merge branch 'tracking-armlt-irqchip-reorg' into lsk-3.9-vexpress
Diffstat (limited to 'arch/arm/mach-prima2')
| -rw-r--r-- | arch/arm/mach-prima2/platsmp.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c index 4b788310f6a..c7c92e78f0c 100644 --- a/arch/arm/mach-prima2/platsmp.c +++ b/arch/arm/mach-prima2/platsmp.c @@ -11,7 +11,6 @@ #include <linux/delay.h> #include <linux/of.h> #include <linux/of_address.h> -#include <linux/irqchip/arm-gic.h> #include <asm/page.h> #include <asm/mach/map.h> #include <asm/smp_plat.h> @@ -49,13 +48,6 @@ void __init sirfsoc_map_scu(void) static void __cpuinit sirfsoc_secondary_init(unsigned int cpu) { /* - * if any interrupts are already enabled for the primary - * core (e.g. timer irq), then they will not have been enabled - * for us: do so - */ - gic_secondary_init(0); - - /* * let the primary processor know we're out of the * pen, then head off into the C entry point */ |