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 commit 'v2.6.27-rc8' into x86/setup
[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
8915a5f
..
4b4230d
100644
(file)
--- a/
arch/arm/mach-imx/clock.c
+++ b/
arch/arm/mach-imx/clock.c
@@
-23,7
+23,7
@@
#include <linux/err.h>
#include <asm/io.h>
-#include <
asm/ar
ch/imx-regs.h>
+#include <
ma
ch/imx-regs.h>
/*
* Very simple approach: We can't disable clocks, so we do