diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-11-01 07:23:14 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-01-10 12:44:40 -0500 |
commit | 428fef8ad855c03b9f61c226c63df61bb43dc3e1 (patch) | |
tree | 850d6b8b8fcf50c4a1aaec31f20a3e427cfceb8f /arch | |
parent | 902ef5d77aeaff43bce8d3ce55c442a12eb71819 (diff) |
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')
-rw-r--r-- | arch/arm/include/asm/hardware/gic.h | 6 |
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 @@ | |||
10 | #ifndef __ASM_ARM_HARDWARE_GIC_H | 10 | #ifndef __ASM_ARM_HARDWARE_GIC_H |
11 | #define __ASM_ARM_HARDWARE_GIC_H | 11 | #define __ASM_ARM_HARDWARE_GIC_H |
12 | 12 | ||
13 | #include <linux/compiler.h> | ||
14 | |||
15 | #define GIC_CPU_CTRL 0x00 | 13 | #define GIC_CPU_CTRL 0x00 |
16 | #define GIC_CPU_PRIMASK 0x04 | 14 | #define GIC_CPU_PRIMASK 0x04 |
17 | #define GIC_CPU_BINPOINT 0x08 | 15 | #define GIC_CPU_BINPOINT 0x08 |
@@ -32,8 +30,6 @@ | |||
32 | #define GIC_DIST_CONFIG 0xc00 | 30 | #define GIC_DIST_CONFIG 0xc00 |
33 | #define GIC_DIST_SOFTINT 0xf00 | 31 | #define GIC_DIST_SOFTINT 0xf00 |
34 | 32 | ||
35 | #ifndef __ASSEMBLY__ | ||
36 | #include <linux/irqdomain.h> | ||
37 | struct device_node; | 33 | struct device_node; |
38 | 34 | ||
39 | extern struct irq_chip gic_arch_extn; | 35 | extern struct irq_chip gic_arch_extn; |
@@ -53,5 +49,3 @@ static inline void gic_init(unsigned int nr, int start, | |||
53 | } | 49 | } |
54 | 50 | ||
55 | #endif | 51 | #endif |
56 | |||
57 | #endif | ||