Skip to content

Commit

Permalink
ARM: get rid of asm/irq.h in asm/prom.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King committed Mar 24, 2012
1 parent f5274c2 commit 5936d11
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/arm/include/asm/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 5936d11

Please sign in to comment.