From 882d41633556b10cd00070582085f918fe9ed39d Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Thu, 1 Nov 2012 06:23:14 -0500
Subject: [PATCH] --- yaml --- r: 355195 b: refs/heads/master c:
 428fef8ad855c03b9f61c226c63df61bb43dc3e1 h: refs/heads/master i:   355193:
 38619ca229d15103d057b1d1d806ee4c27738982   355191:
 bc82268808c3c7aac0a29ed1263d8ea99a41066e v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/include/asm/hardware/gic.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6e2e13d93008..82f0c33ea318 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 902ef5d77aeaff43bce8d3ce55c442a12eb71819
+refs/heads/master: 428fef8ad855c03b9f61c226c63df61bb43dc3e1
diff --git a/trunk/arch/arm/include/asm/hardware/gic.h b/trunk/arch/arm/include/asm/hardware/gic.h
index 4b1ce6cd477f..fc596989241b 100644
--- a/trunk/arch/arm/include/asm/hardware/gic.h
+++ b/trunk/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