diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-05-09 22:18:58 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-05-09 22:18:58 +0200 |
| commit | 356cd17cc289e2dac409d21607618650d6f388a5 (patch) | |
| tree | fce11759308e036087dd5197f52d54a8d0602ae7 /common | |
| parent | ef2642625cbfb1c3695e3478d08ae515052a4950 (diff) | |
| parent | 726c0f1e5f108dccea052965123b95837d2bd402 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_ide.c | 4 | ||||
| -rw-r--r-- | common/image.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index ead7e10d66..cac99d5fe7 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -52,10 +52,6 @@ # include <status_led.h> #endif -#ifndef __PPC__ -#include <asm/io.h> -#endif - #ifdef CONFIG_IDE_8xx_DIRECT DECLARE_GLOBAL_DATA_PTR; #endif diff --git a/common/image.c b/common/image.c index 4a024d4dfb..051d298050 100644 --- a/common/image.c +++ b/common/image.c @@ -93,6 +93,7 @@ static table_entry_t uimage_arch[] = { { IH_ARCH_MIPS64, "mips64", "MIPS 64 Bit", }, { IH_ARCH_NIOS, "nios", "NIOS", }, { IH_ARCH_NIOS2, "nios2", "NIOS II", }, + { IH_ARCH_PPC, "powerpc", "PowerPC", }, { IH_ARCH_PPC, "ppc", "PowerPC", }, { IH_ARCH_S390, "s390", "IBM S390", }, { IH_ARCH_SH, "sh", "SuperH", }, |