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 tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
clock.c
diff --git
a/arch/arm/mach-ep93xx/clock.c
b/arch/arm/mach-ep93xx/clock.c
index d2eee707d27f8e94bf9cb0bf7a7eb70c93dba2ab..b9f523d9dc8cf18ad7ae8dd942039cfa1d1a6140 100644
(file)
--- a/
arch/arm/mach-ep93xx/clock.c
+++ b/
arch/arm/mach-ep93xx/clock.c
@@
-20,8
+20,9
@@
#include <linux/io.h>
#include <linux/spinlock.h>
#include <linux/clkdev.h>
+#include <linux/soc/cirrus/ep93xx.h>
-#include
<mach/hardware.h>
+#include
"hardware.h"
#include <asm/div64.h>