diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-04 00:49:14 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-04 00:49:14 +0200 |
commit | 87e8b821ed8db3dab03d96cd542e29666bf210aa (patch) | |
tree | 0027060473aafbbb125655ba027319c8a1a665fc /arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | |
parent | sparc64: Fix array size reported by vmemmap_populate() (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
download | linux-87e8b821ed8db3dab03d96cd542e29666bf210aa.tar.xz linux-87e8b821ed8db3dab03d96cd542e29666bf210aa.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c')
-rw-r--r-- | arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c index 7382b6d27ee1..f3b169d5245f 100644 --- a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c @@ -28,7 +28,7 @@ #include <asm/mach/arch.h> #include <mach/common.h> -#include <mach/iomux.h> +#include <mach/iomux-mx27.h> #include <mach/imxfb.h> #include <mach/hardware.h> #include <mach/mmc.h> |