diff --git a/[refs] b/[refs] index f1a42805572c..e15912ca579c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfa76060be85dd48d3803bc26f6a6d2e93e812f0 +refs/heads/master: efeac2f87609ab25dab329ce16876eb9110b2084 diff --git a/trunk/arch/sparc/kernel/prom.h b/trunk/arch/sparc/kernel/prom.h index dce53de274e8..b7258ce87ccc 100644 --- a/trunk/arch/sparc/kernel/prom.h +++ b/trunk/arch/sparc/kernel/prom.h @@ -7,4 +7,6 @@ extern struct device_node *allnodes; /* temporary while merging */ extern rwlock_t devtree_lock; /* temporary while merging */ +extern void * prom_early_alloc(unsigned long size); + #endif /* __PROM_H */ diff --git a/trunk/arch/sparc/kernel/prom_32.c b/trunk/arch/sparc/kernel/prom_32.c index e41df66192e5..ba3c55186823 100644 --- a/trunk/arch/sparc/kernel/prom_32.c +++ b/trunk/arch/sparc/kernel/prom_32.c @@ -29,7 +29,7 @@ static unsigned int prom_early_allocated; -static void * __init prom_early_alloc(unsigned long size) +void * __init prom_early_alloc(unsigned long size) { void *ret; diff --git a/trunk/arch/sparc/kernel/prom_64.c b/trunk/arch/sparc/kernel/prom_64.c index 1f5666a94884..1c7b9d7b7889 100644 --- a/trunk/arch/sparc/kernel/prom_64.c +++ b/trunk/arch/sparc/kernel/prom_64.c @@ -34,7 +34,7 @@ static unsigned int prom_early_allocated __initdata; -static void * __init prom_early_alloc(unsigned long size) +void * __init prom_early_alloc(unsigned long size) { unsigned long paddr = lmb_alloc(size, SMP_CACHE_BYTES); void *ret;