projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[cascardo/linux.git]
/
drivers
/
rtc
/
rtc-s3c.c
diff --git
a/drivers/rtc/rtc-s3c.c
b/drivers/rtc/rtc-s3c.c
index
54b1ebb
..
e7d19b6
100644
(file)
--- a/
drivers/rtc/rtc-s3c.c
+++ b/
drivers/rtc/rtc-s3c.c
@@
-22,7
+22,7
@@
#include <linux/clk.h>
#include <linux/log2.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>