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 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
arch
/
arm
/
mach-nomadik
/
clock.c
diff --git
a/arch/arm/mach-nomadik/clock.c
b/arch/arm/mach-nomadik/clock.c
index
89f793a
..
48a59f2
100644
(file)
--- a/
arch/arm/mach-nomadik/clock.c
+++ b/
arch/arm/mach-nomadik/clock.c
@@
-7,7
+7,7
@@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/clk.h>
-#include <
asm
/clkdev.h>
+#include <
linux
/clkdev.h>
#include "clock.h"
/*