git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
arch
/
arm
/
mach-u300
/
clock.c
diff --git
a/arch/arm/mach-u300/clock.c
b/arch/arm/mach-u300/clock.c
index
7458fc6
..
fabcc49
100644
(file)
--- a/
arch/arm/mach-u300/clock.c
+++ b/
arch/arm/mach-u300/clock.c
@@
-25,8
+25,8
@@
#include <linux/timer.h>
#include <linux/io.h>
#include <linux/seq_file.h>
#include <linux/timer.h>
#include <linux/io.h>
#include <linux/seq_file.h>
+#include <linux/clkdev.h>
-#include <asm/clkdev.h>
#include <mach/hardware.h>
#include <mach/syscon.h>
#include <mach/hardware.h>
#include <mach/syscon.h>