diff options
| author | James Morris <jmorris@namei.org> | 2008-08-28 04:47:34 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 04:47:34 +0400 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /arch/arm/plat-mxc/iomux-mx1-mx2.c | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
| download | linux-86d688984deefa3ae5a802880c11f2b408b5d6cf.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/plat-mxc/iomux-mx1-mx2.c')
| -rw-r--r-- | arch/arm/plat-mxc/iomux-mx1-mx2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/iomux-mx1-mx2.c b/arch/arm/plat-mxc/iomux-mx1-mx2.c index 1985571eb40c..d97387aa9a42 100644 --- a/arch/arm/plat-mxc/iomux-mx1-mx2.c +++ b/arch/arm/plat-mxc/iomux-mx1-mx2.c @@ -30,9 +30,9 @@ #include <linux/string.h> #include <linux/gpio.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach/map.h> -#include <asm/arch/iomux-mx1-mx2.h> +#include <mach/iomux-mx1-mx2.h> void mxc_gpio_mode(int gpio_mode) { |