From 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 12 Sep 1997 01:29:55 +0000 Subject: Merge with Linux 2.1.55. More bugfixes and goodies from my private CVS archive. --- arch/sparc64/prom/tree.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'arch/sparc64/prom/tree.c') diff --git a/arch/sparc64/prom/tree.c b/arch/sparc64/prom/tree.c index ae4baf858..c2b386641 100644 --- a/arch/sparc64/prom/tree.c +++ b/arch/sparc64/prom/tree.c @@ -1,4 +1,4 @@ -/* $Id: tree.c,v 1.5 1997/03/24 17:44:01 jj Exp $ +/* $Id: tree.c,v 1.6 1997/08/12 16:32:48 davem Exp $ * tree.c: Basic device tree traversal/scanning for the Linux * prom library. * @@ -26,7 +26,7 @@ __prom_getchild(int node) __inline__ int prom_getchild(int node) { - long cnode; + int cnode; if(node == -1) return 0; cnode = __prom_getchild(node); @@ -37,7 +37,7 @@ prom_getchild(int node) __inline__ int prom_getparent(int node) { - long cnode; + int cnode; if(node == -1) return 0; cnode = p1275_cmd ("parent", P1275_INOUT(1, 1), node); @@ -57,12 +57,12 @@ __prom_getsibling(int node) __inline__ int prom_getsibling(int node) { - long sibnode; + int sibnode; if(node == -1) return 0; sibnode = __prom_getsibling(node); if(sibnode == -1) return 0; - return (int)sibnode; + return sibnode; } /* Return the length in bytes of property 'prop' at node 'node'. -- cgit v1.2.3