diff options
| author | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /arch/arm/mach-mx2/mx27ads.c | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-mx2/mx27ads.c')
| -rw-r--r-- | arch/arm/mach-mx2/mx27ads.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-mx2/mx27ads.c b/arch/arm/mach-mx2/mx27ads.c index a9ff01fff13..4ce56ef4d8d 100644 --- a/arch/arm/mach-mx2/mx27ads.c +++ b/arch/arm/mach-mx2/mx27ads.c @@ -23,16 +23,16 @@ #include <linux/mtd/map.h> #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> -#include <asm/arch/common.h> -#include <asm/hardware.h> +#include <mach/common.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <asm/mach/map.h> -#include <asm/arch/gpio.h> -#include <asm/arch/imx-uart.h> -#include <asm/arch/iomux-mx1-mx2.h> -#include <asm/arch/board-mx27ads.h> +#include <mach/gpio.h> +#include <mach/imx-uart.h> +#include <mach/iomux-mx1-mx2.h> +#include <mach/board-mx27ads.h> /* ADS's NOR flash */ static struct physmap_flash_data mx27ads_flash_data = { |