summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-11-01 12:23:14 +0100
committerRob Herring <rob.herring@calxeda.com>2013-01-10 18:44:40 +0100
commit428fef8ad855c03b9f61c226c63df61bb43dc3e1 (patch)
tree850d6b8b8fcf50c4a1aaec31f20a3e427cfceb8f /arch/arm
parentARM: mach-ux500: use SGI0 to wake up the other core (diff)
downloadlinux-428fef8ad855c03b9f61c226c63df61bb43dc3e1.tar.xz
linux-428fef8ad855c03b9f61c226c63df61bb43dc3e1.zip
ARM: GIC: remove assembly ifdefs from gic.h
With multi irq handler and all GIC users converted to it, we don't need asm/hardware/gic.h to be included in assembly. Clean-up ifdefs and unnecessary includes. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/hardware/gic.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/include/asm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h
index 4b1ce6cd477f..fc596989241b 100644
--- a/arch/arm/include/asm/hardware/gic.h
+++ b/arch/arm/include/asm/hardware/gic.h
@@ -10,8 +10,6 @@
#ifndef __ASM_ARM_HARDWARE_GIC_H
#define __ASM_ARM_HARDWARE_GIC_H
-#include <linux/compiler.h>
-
#define GIC_CPU_CTRL 0x00
#define GIC_CPU_PRIMASK 0x04
#define GIC_CPU_BINPOINT 0x08
@@ -32,8 +30,6 @@
#define GIC_DIST_CONFIG 0xc00
#define GIC_DIST_SOFTINT 0xf00
-#ifndef __ASSEMBLY__
-#include <linux/irqdomain.h>
struct device_node;
extern struct irq_chip gic_arch_extn;
@@ -53,5 +49,3 @@ static inline void gic_init(unsigned int nr, int start,
}
#endif
-
-#endif