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 branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
clock.c
diff --git
a/arch/arm/mach-imx/clock.c
b/arch/arm/mach-imx/clock.c
index
4b4230d
..
7ec60fc
100644
(file)
--- a/
arch/arm/mach-imx/clock.c
+++ b/
arch/arm/mach-imx/clock.c
@@
-21,8
+21,8
@@
#include <linux/list.h>
#include <linux/math64.h>
#include <linux/err.h>
+#include <linux/io.h>
-#include <asm/io.h>
#include <mach/imx-regs.h>
/*