diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-01-03 09:46:55 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-01-03 09:46:55 -0600 |
| commit | 2c3536425d987bf079258973e2acebaaef3e16b6 (patch) | |
| tree | 659d06dd33eca4888e1f6d01d046507b76dc2d27 /board/mpl/common | |
| parent | f743931f9b4d4e15c9bdfe726bef033ea1f1402c (diff) | |
| parent | ce37422d0002e10490e268392e0c4e3028e52cec (diff) | |
Merge commit 'wd/master'
Diffstat (limited to 'board/mpl/common')
| -rw-r--r-- | board/mpl/common/common_util.c | 6 | ||||
| -rw-r--r-- | board/mpl/common/flash.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index 278ad5c348..8d4cbe852e 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -36,11 +36,11 @@ #ifdef CONFIG_PIP405 #include "../pip405/pip405.h" -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #endif #ifdef CONFIG_MIP405 #include "../mip405/mip405.h" -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #endif DECLARE_GLOBAL_DATA_PTR; @@ -587,7 +587,7 @@ extern int get_boot_mode(void); void video_get_info_str (int line_number, char *info) { /* init video info strings for graphic console */ - PPC405_SYS_INFO sys_info; + PPC4xx_SYS_INFO sys_info; char rev; int i,boot; unsigned long pvr; diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c index fd430083e2..6f53192ac7 100644 --- a/board/mpl/common/flash.c +++ b/board/mpl/common/flash.c @@ -47,7 +47,7 @@ #if defined(CONFIG_PIP405) #include "../pip405/pip405.h" #endif -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #else /* defined(CONFIG_PATI) */ #include <mpc5xx.h> #endif |