Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / irqs.h

diff --git a/include/asm-arm/arch-omap/irqs.h b/arch/arm/plat-omap/include/mach/irqs.h
similarity index 99%
rename from include/asm-arm/arch-omap/irqs.h
rename to arch/arm/plat-omap/include/mach/irqs.h
index f901e8b42577b7dd31dd008fa2a7b720409e59dd..e51e5e65920c839e243e74fc910e0650cf5eccd5 100644 (file)
--- a/include/asm-arm/arch-omap/irqs.h
+++ b/arch/arm/plat-omap/include/mach/irqs.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-omap/irqs.h
+ *  arch/arm/plat-omap/include/mach/irqs.h
  *
  *  Copyright (C) Greg Lonnon 2001
  *  Updated for OMAP-1610 by Tony Lindgren <tony@atomide.com>
@@ -372,6 +372,6 @@ extern void omap_init_irq(void);
 extern int omap_irq_pending(void);
 #endif
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #endif