aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/prom_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/kernel/prom_32.c')
-rw-r--r--arch/sparc/kernel/prom_32.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index ba3c55186823..c34888a21b2d 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -196,8 +196,6 @@ static char * __init build_full_name(struct device_node *dp)
196 return n; 196 return n;
197} 197}
198 198
199static unsigned int unique_id;
200
201static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len) 199static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)
202{ 200{
203 static struct property *tmp = NULL; 201 static struct property *tmp = NULL;
@@ -211,7 +209,7 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s
211 tmp = NULL; 209 tmp = NULL;
212 } else { 210 } else {
213 p = prom_early_alloc(sizeof(struct property) + 32); 211 p = prom_early_alloc(sizeof(struct property) + 32);
214 p->unique_id = unique_id++; 212 p->unique_id = prom_unique_id++;
215 } 213 }
216 214
217 p->name = (char *) (p + 1); 215 p->name = (char *) (p + 1);
@@ -286,7 +284,7 @@ static struct device_node * __init create_node(phandle node)
286 return NULL; 284 return NULL;
287 285
288 dp = prom_early_alloc(sizeof(*dp)); 286 dp = prom_early_alloc(sizeof(*dp));
289 dp->unique_id = unique_id++; 287 dp->unique_id = prom_unique_id++;
290 288
291 kref_init(&dp->kref); 289 kref_init(&dp->kref);
292 290