projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
[cascardo/linux.git]
/
drivers
/
rtc
/
rtc-s3c.c
diff --git
a/drivers/rtc/rtc-s3c.c
b/drivers/rtc/rtc-s3c.c
index
7e6af0b
..
bfbd92c
100644
(file)
--- a/
drivers/rtc/rtc-s3c.c
+++ b/
drivers/rtc/rtc-s3c.c
@@
-26,10
+26,10
@@
#include <linux/log2.h>
#include <linux/slab.h>
#include <linux/of.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
#include <asm/irq.h>
#include <plat/regs-rtc.h>