summaryrefslogtreecommitdiffstats
path: root/post
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-09-28 23:30:47 +0200
committerWolfgang Denk <wd@denx.de>2010-09-28 23:30:47 +0200
commit2e6e1772c0e34871769be4aef79748fe3e47d953 (patch)
tree00e4e19d7bccd2a1cd5753854ff4c2b8a26bebb0 /post
parent1e4e5ef0469050f014aee1204dae8a9ab6053e49 (diff)
parent3df61957938586c512c17e72d83551d190400981 (diff)
downloadtalos-obmc-uboot-2e6e1772c0e34871769be4aef79748fe3e47d953.tar.gz
talos-obmc-uboot-2e6e1772c0e34871769be4aef79748fe3e47d953.zip
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 'post')
-rw-r--r--post/board/lwmon5/watchdog.c2
-rw-r--r--post/cpu/ppc4xx/denali_ecc.c2
-rw-r--r--post/cpu/ppc4xx/ether.c4
-rw-r--r--post/cpu/ppc4xx/fpu.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/post/board/lwmon5/watchdog.c b/post/board/lwmon5/watchdog.c
index 44f0488323..f181506fe4 100644
--- a/post/board/lwmon5/watchdog.c
+++ b/post/board/lwmon5/watchdog.c
@@ -34,7 +34,7 @@
#if CONFIG_POST & CONFIG_SYS_POST_WATCHDOG
#include <watchdog.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/io.h>
static uint watchdog_magic_read(void)
diff --git a/post/cpu/ppc4xx/denali_ecc.c b/post/cpu/ppc4xx/denali_ecc.c
index 6ab1593138..50ae7fb8f0 100644
--- a/post/cpu/ppc4xx/denali_ecc.c
+++ b/post/cpu/ppc4xx/denali_ecc.c
@@ -45,7 +45,7 @@
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/io.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/post/cpu/ppc4xx/ether.c b/post/cpu/ppc4xx/ether.c
index a58db04e49..7f44f38dab 100644
--- a/post/cpu/ppc4xx/ether.c
+++ b/post/cpu/ppc4xx/ether.c
@@ -44,8 +44,8 @@
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/processor.h>
-#include <405_mal.h>
-#include <ppc4xx_enet.h>
+#include <asm/ppc4xx-mal.h>
+#include <asm/ppc4xx-emac.h>
#include <malloc.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/post/cpu/ppc4xx/fpu.c b/post/cpu/ppc4xx/fpu.c
index e9b96dde8d..9f496906d2 100644
--- a/post/cpu/ppc4xx/fpu.c
+++ b/post/cpu/ppc4xx/fpu.c
@@ -29,7 +29,7 @@
defined(CONFIG_440EPX)
#include <asm/processor.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
int fpu_status(void)
OpenPOWER on IntegriCloud