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 /arch/arm/mach-s3c24xx/generic.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 'arch/arm/mach-s3c24xx/generic.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/generic.c b/arch/arm/mach-s3c24xx/generic.c index 515731a5a4..4613e59760 100644 --- a/arch/arm/mach-s3c24xx/generic.c +++ b/arch/arm/mach-s3c24xx/generic.c @@ -27,7 +27,7 @@ #include <init.h> #include <clock.h> #include <asm/io.h> -#include <asm/arch/s3c24x0-iomap.h> +#include <mach/s3c24x0-iomap.h> /** * Calculate the current M-PLL clock. |