diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-04-19 10:26:18 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-04-19 10:26:18 +0900 |
| commit | 83653121d7382fccfe329cb732f77f116341ef1d (patch) | |
| tree | 0b1ce6764252af15dfb2614372de98a44a7ec61f /board/phytec/pcm030/pcm030.c | |
| parent | 0f1f21a345e02a68ec16f7ab9e7dc687f9276089 (diff) | |
| parent | 07739bcef5da07cc4a4edef8b91014ccc332eda3 (diff) | |
| download | u-boot-imx-83653121d7382fccfe329cb732f77f116341ef1d.zip u-boot-imx-83653121d7382fccfe329cb732f77f116341ef1d.tar.gz u-boot-imx-83653121d7382fccfe329cb732f77f116341ef1d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm1176/cpu.c
cpu/arm1176/start.S
cpu/arm_cortexa8/s5pc1xx/Makefile
cpu/arm_cortexa8/s5pc1xx/clock.c
drivers/serial/serial_s5p.c
include/asm-arm/arch-s5pc1xx/clk.h
include/asm-arm/arch-s5pc1xx/gpio.h
include/asm-arm/arch-s5pc1xx/uart.h
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'board/phytec/pcm030/pcm030.c')
| -rw-r--r-- | board/phytec/pcm030/pcm030.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/phytec/pcm030/pcm030.c b/board/phytec/pcm030/pcm030.c index 416d307..77ce389 100644 --- a/board/phytec/pcm030/pcm030.c +++ b/board/phytec/pcm030/pcm030.c @@ -30,7 +30,7 @@ #include <common.h> #include <mpc5xxx.h> #include <pci.h> -#include <asm-ppc/io.h> +#include <asm/io.h> #include "mt46v32m16-75.h" |