diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-03 19:28:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-03 19:28:46 +0200 |
| commit | f68ec0c24755e5cdb779be6240925f2175311d84 (patch) | |
| tree | a7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /arch/arm/mach-mx2/pcm038.c | |
| parent | 98920dc3d1113b883cbc73e3293446d3525c6042 (diff) | |
| parent | 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff) | |
Merge commit 'v2.6.27-rc8' into x86/setup
Diffstat (limited to 'arch/arm/mach-mx2/pcm038.c')
| -rw-r--r-- | arch/arm/mach-mx2/pcm038.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c index a9a28f58e71..1028f453cfc 100644 --- a/arch/arm/mach-mx2/pcm038.c +++ b/arch/arm/mach-mx2/pcm038.c @@ -21,12 +21,12 @@ #include <linux/mtd/physmap.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> -#include <asm/arch/common.h> -#include <asm/hardware.h> -#include <asm/arch/iomux-mx1-mx2.h> +#include <mach/common.h> +#include <mach/hardware.h> +#include <mach/iomux-mx1-mx2.h> #include <asm/mach/time.h> -#include <asm/arch/imx-uart.h> -#include <asm/arch/board-pcm038.h> +#include <mach/imx-uart.h> +#include <mach/board-pcm038.h> /* * Phytec's phyCORE-i.MX27 comes with 32MiB flash, |