diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-28 23:30:47 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-28 23:30:47 +0200 |
| commit | 2e6e1772c0e34871769be4aef79748fe3e47d953 (patch) | |
| tree | 00e4e19d7bccd2a1cd5753854ff4c2b8a26bebb0 /board/prodrive/alpr | |
| parent | 1e4e5ef0469050f014aee1204dae8a9ab6053e49 (diff) | |
| parent | 3df61957938586c512c17e72d83551d190400981 (diff) | |
| download | u-boot-imx-2e6e1772c0e34871769be4aef79748fe3e47d953.zip u-boot-imx-2e6e1772c0e34871769be4aef79748fe3e47d953.tar.gz u-boot-imx-2e6e1772c0e34871769be4aef79748fe3e47d953.tar.bz2 | |
Merge branch 'next' of /home/wd/git/u-boot/next
Conflicts:
include/ppc4xx.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/prodrive/alpr')
| -rw-r--r-- | board/prodrive/alpr/alpr.c | 2 | ||||
| -rw-r--r-- | board/prodrive/alpr/fpga.c | 2 | ||||
| -rw-r--r-- | board/prodrive/alpr/init.S | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/board/prodrive/alpr/alpr.c b/board/prodrive/alpr/alpr.c index 060e7eb..1784982 100644 --- a/board/prodrive/alpr/alpr.c +++ b/board/prodrive/alpr/alpr.c @@ -26,7 +26,7 @@ #include <libfdt.h> #include <fdt_support.h> #include <spd_sdram.h> -#include <ppc4xx_enet.h> +#include <asm/ppc4xx-emac.h> #include <miiphy.h> #include <asm/processor.h> #include <asm/4xx_pci.h> diff --git a/board/prodrive/alpr/fpga.c b/board/prodrive/alpr/fpga.c index f3bc1fa..93f2449 100644 --- a/board/prodrive/alpr/fpga.c +++ b/board/prodrive/alpr/fpga.c @@ -31,7 +31,7 @@ #include <ACEX1K.h> #include <command.h> #include <asm/processor.h> -#include <ppc440.h> +#include <asm/ppc440.h> #include "fpga.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/prodrive/alpr/init.S b/board/prodrive/alpr/init.S index 9f9812a..119bc53 100644 --- a/board/prodrive/alpr/init.S +++ b/board/prodrive/alpr/init.S @@ -24,6 +24,7 @@ #include <ppc_asm.tmpl> #include <asm/mmu.h> #include <config.h> +#include <asm/ppc4xx.h> /************************************************************************** * TLB TABLE |