diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /arch/mips64/arc | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'arch/mips64/arc')
| -rw-r--r-- | arch/mips64/arc/env.c | 2 | ||||
| -rw-r--r-- | arch/mips64/arc/identify.c | 2 | ||||
| -rw-r--r-- | arch/mips64/arc/tree.c | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/mips64/arc/env.c b/arch/mips64/arc/env.c index 062a1e2c7..17ae2631b 100644 --- a/arch/mips64/arc/env.c +++ b/arch/mips64/arc/env.c @@ -16,7 +16,7 @@ #include <asm/sgialib.h> CHAR * __init -ArcArcGetEnvironmentVariable(CHAR *name) +ArcGetEnvironmentVariable(CHAR *name) { return (CHAR *) ARC_CALL1(get_evar, name); } diff --git a/arch/mips64/arc/identify.c b/arch/mips64/arc/identify.c index 958a38595..f87de0bda 100644 --- a/arch/mips64/arc/identify.c +++ b/arch/mips64/arc/identify.c @@ -62,7 +62,7 @@ prom_identify_arch(void) /* The root component tells us what machine architecture we have here. */ - p = prom_getchild(PROM_NULL_COMPONENT); + p = ArcGetChild(PROM_NULL_COMPONENT); printk("ARCH: %s\n", p->iname); mach = string_to_mach(p->iname); diff --git a/arch/mips64/arc/tree.c b/arch/mips64/arc/tree.c index ec53c1ac0..36045cbdd 100644 --- a/arch/mips64/arc/tree.c +++ b/arch/mips64/arc/tree.c @@ -105,10 +105,10 @@ static void __init traverse(pcomponent *p, int op) { dump_component(p); - if(prom_getchild(p)) - traverse(prom_getchild(p), 1); - if(prom_getsibling(p) && op) - traverse(prom_getsibling(p), 1); + if(ArcGetChild(p)) + traverse(ArcGetChild(p), 1); + if(ArcGetPeer(p) && op) + traverse(ArcGetPeer(p), 1); } void __init @@ -116,12 +116,12 @@ prom_testtree(void) { pcomponent *p; - p = prom_getchild(PROM_NULL_COMPONENT); + p = ArcGetChild(PROM_NULL_COMPONENT); dump_component(p); - p = prom_getchild(p); + p = ArcGetChild(p); while(p) { dump_component(p); - p = prom_getsibling(p); + p = ArcGetPeer(p); } prom_printf("press a key\n"); prom_getchar(); |