Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / linux / i2c / twl4030.h

diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index b141cc73c23b7796beebf1b27866307199f0c301..00e14fc37f4416d0f490ca7e156e34dc3ad969bf 100644 (file)
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -53,7 +53,7 @@
 #define TWL4030_MODULE_SECURED_REG     0x15
 
 /* IRQ information-need base */
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 /* TWL4030 interrupts */
 
 #define TWL4030_MODIRQ_GPIO            (TWL4030_IRQ_BASE + 0)