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 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx2
/
mach-mx21ads.c
diff --git
a/arch/arm/mach-mx2/mach-mx21ads.c
b/arch/arm/mach-mx2/mach-mx21ads.c
index
393bc07
..
113e58d
100644
(file)
--- a/
arch/arm/mach-mx2/mach-mx21ads.c
+++ b/
arch/arm/mach-mx2/mach-mx21ads.c
@@
-30,7
+30,7
@@
#include <asm/mach/map.h>
#include <mach/imx-uart.h>
#include <mach/imxfb.h>
-#include <mach/iomux.h>
+#include <mach/iomux
-mx21
.h>
#include <mach/mxc_nand.h>
#include <mach/mmc.h>
#include <mach/board-mx21ads.h>