Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / rtc / rtc-twl4030.c

diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl4030.c
index 269ff615c0fdf88fe626c9f93499ac4f63a297a2..bfcf51511419f29c6e3a8d33da4fcd0052491fa2 100644 (file)
--- a/drivers/rtc/rtc-twl4030.c
+++ b/drivers/rtc/rtc-twl4030.c
@@ -41,7 +41,7 @@
 
 #include <asm/mach/time.h>
 #include <asm/system.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #define ALL_TIME_REGS          6