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 git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-imx27_visstrim_m10.c
diff --git
a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index
c6269d6
..
6707de0
100644
(file)
--- a/
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@
-34,7
+34,7
@@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/common.h>
-#include <mach/iomux.h>
+#include <mach/iomux
-mx27
.h>
#include "devices-imx27.h"