diff options
author | Olof Johansson | 2012-11-06 06:48:05 -0800 |
---|---|---|
committer | Olof Johansson | 2012-11-06 06:48:05 -0800 |
commit | 3b19119b95a52200c8ae3df3aa89c21c9a1a8894 (patch) | |
tree | 3ae74b8a35b3d1f639a68c1690af1c06e14a1571 /arch/arm/mach-ux500 | |
parent | ccb1cfcb964fa8a8acd58b7783b2e82d7ad7975b (diff) | |
parent | e095c0d122c09efabe7d4136ce77f72c636c4879 (diff) |
Merge tag 'calxeda-ecx-2000' of git://sources.calxeda.com/kernel/linux into next/soc
Support for Calxeda ECX-2000 SOC from Rob Herring
* tag 'calxeda-ecx-2000' of git://sources.calxeda.com/kernel/linux:
ARM: highbank: Add initial ECX-2000 support
ARM: highbank: abstract out SCU usage
ARM: smp_twd: don't warn on no DT node
ARM: dts: Add Calxeda ECX-2000 support
ARM: highbank: enable coherent DMA for xgmac in dts
ARM: highbank: disable unused sdhci and gpio in dts
+ sync to Linux 3.7-rc3
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r-- | arch/arm/mach-ux500/cpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 2236cbd03cd7..1f3fbc2bb776 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -16,6 +16,7 @@ #include <linux/stat.h> #include <linux/of.h> #include <linux/of_irq.h> +#include <linux/irq.h> #include <linux/platform_data/clk-ux500.h> #include <asm/hardware/gic.h> |