projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.27-rc6' into x86/pat
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-sa1100.c
diff --git
a/drivers/rtc/rtc-sa1100.c
b/drivers/rtc/rtc-sa1100.c
index f47294c6014866e7c4800368b87c74c3c4f88edc..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
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/irq.h>
#ifdef CONFIG_ARCH_PXA
-#include <
asm/ar
ch/pxa-regs.h>
+#include <
ma
ch/pxa-regs.h>
#endif
#define TIMER_FREQ CLOCK_TICK_RATE