diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-28 10:10:56 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-28 10:10:56 +0100 |
| commit | 40a5f3de4e19d43fd34ddd0d81542f73ec64a287 (patch) | |
| tree | 0ecbebaaa9ddec5dce11382cfce8b473517b4ae6 /board/freescale-mx25-3-stack/3stack.c | |
| parent | 5b28d03dbbfda2409a8bff4b77d5f38824a74782 (diff) | |
| parent | daad436bf76ad8acdf66326b1cc3769434cca97f (diff) | |
| download | barebox-40a5f3de4e19d43fd34ddd0d81542f73ec64a287.tar.gz barebox-40a5f3de4e19d43fd34ddd0d81542f73ec64a287.tar.xz | |
Merge branch 'for-sascha' of git://uboot.jcrosoft.org/u-boot-v2 into from-jean
Conflicts:
board/a9m2440/a9m2440.c
board/pcm043/pcm043.c
drivers/nand/nand_imx.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'board/freescale-mx25-3-stack/3stack.c')
| -rw-r--r-- | board/freescale-mx25-3-stack/3stack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c index 0f770ee5ca..3acc46bd22 100644 --- a/board/freescale-mx25-3-stack/3stack.c +++ b/board/freescale-mx25-3-stack/3stack.c @@ -25,17 +25,17 @@ #include <init.h> #include <driver.h> #include <environment.h> -#include <asm/arch/imx-regs.h> +#include <mach/imx-regs.h> #include <asm/armlinux.h> -#include <asm/arch/gpio.h> +#include <mach/gpio.h> #include <asm/io.h> #include <partition.h> #include <asm/mach-types.h> -#include <asm/arch/imx-nand.h> +#include <mach/imx-nand.h> #include <fec.h> #include <nand.h> -#include <asm/arch/imx25-flash-header.h> -#include <asm/arch/iomux-mx25.h> +#include <mach/imx25-flash-header.h> +#include <mach/iomux-mx25.h> extern unsigned long _stext; |