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 'devel-stable' into devel
[cascardo/linux.git]
/
arch
/
arm
/
mach-mx3
/
clock-imx31.c
diff --git
a/arch/arm/mach-mx3/clock-imx31.c
b/arch/arm/mach-mx3/clock-imx31.c
index
4193cf5
..
d423cac
100644
(file)
--- a/
arch/arm/mach-mx3/clock-imx31.c
+++ b/
arch/arm/mach-mx3/clock-imx31.c
@@
-23,8
+23,8
@@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/io.h>
+#include <linux/clkdev.h>
-#include <asm/clkdev.h>
#include <asm/div64.h>
#include <mach/clock.h>