git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/jack-mechanical' into to-push
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-davinci
/
time.c
diff --git
a/arch/arm/mach-davinci/time.c
b/arch/arm/mach-davinci/time.c
index 206e80d41717b79fb6c647e14e463c1217c0f16e..3b9a296b5c4ba43ee703b7ccafce24fdd6067d44 100644
(file)
--- a/
arch/arm/mach-davinci/time.c
+++ b/
arch/arm/mach-davinci/time.c
@@
-15,8
+15,8
@@
#include <linux/clocksource.h>
#include <linux/clockchips.h>
#include <linux/spinlock.h>
+#include <linux/io.h>
-#include <asm/io.h>
#include <mach/hardware.h>
#include <asm/system.h>
#include <asm/irq.h>