path: root/arch/arm/include/asm
diff options
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-02-09 16:16:28 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-24 09:38:54 +0000
commit5936d1161ff503a1170722fe9b2d9ac4da700eef (patch)
tree266428ad16aa785fb7436e248ac9103b591c9c20 /arch/arm/include/asm
parentf5274c2d0d8d91076af8605187d762dfa0b92825 (diff)
ARM: get rid of asm/irq.h in asm/prom.h
Avoid potential build problems caused by lacking mach/irqs.h includes on non-OF builds caused by an errant include in asm/prom.h. asm/prom.h requires nothing from asm/irq.h, as Grant says: On Mon, Feb 06, 2012 at 05:56:23AM +0000, Grant Likely wrote: > On Sat, Feb 04, 2012 at 10:17:48PM +0000, Russell King wrote: > > Finally, do we need asm/irq.h in our asm/prom.h ? That's causing > > fragility between DT and non-DT builds, because people are finding > > that their DT builds work without their mach/irqs.h includes but > > fail when built with non-DT. The only thing which DT might need - > > at the most - is NR_IRQS, but I'd hope with things like irq domains > > it doesn't actually require it. > > I don't think so. There may be a file or two that break because they're > not including everything they need, but I don't think anything in the > header requires it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm')
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h
index ee036330791..aeae9c609df 100644
--- a/arch/arm/include/asm/prom.h
+++ b/arch/arm/include/asm/prom.h
@@ -13,8 +13,6 @@
#ifdef CONFIG_OF
-#include <asm/irq.h>
extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
extern void arm_dt_memblock_reserve(void);