Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / rtc / rtc-sa1100.c

diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index a0982d67e085616a9ec24836ff252ab4dac5bc1f..66a9bb85bbe8698e2b7234b4d26f4b13ef3d52d0 100644 (file)
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -31,11 +31,11 @@
 #include <linux/pm.h>
 #include <linux/bitops.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #ifdef CONFIG_ARCH_PXA
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 #endif
 
 #define TIMER_FREQ             CLOCK_TICK_RATE