git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
sparc
/
prom
/
ranges.c
diff --git
a/arch/sparc/prom/ranges.c
b/arch/sparc/prom/ranges.c
index
aeff43e
..
541fc82
100644
(file)
--- a/
arch/sparc/prom/ranges.c
+++ b/
arch/sparc/prom/ranges.c
@@
-68,7
+68,7
@@
EXPORT_SYMBOL(prom_apply_obio_ranges);
void __init prom_ranges_init(void)
{
void __init prom_ranges_init(void)
{
-
int
node, obio_node;
+
phandle
node, obio_node;
int success;
num_obio_ranges = 0;
int success;
num_obio_ranges = 0;
@@
-89,8
+89,8
@@
void __init prom_ranges_init(void)
prom_printf("PROMLIB: obio_ranges %d\n", num_obio_ranges);
}
prom_printf("PROMLIB: obio_ranges %d\n", num_obio_ranges);
}
-void
-
prom_apply_generic_ranges (int node, int parent,
struct linux_prom_registers *regs, int nregs)
+void
prom_apply_generic_ranges(phandle node, phandle parent,
+
struct linux_prom_registers *regs, int nregs)
{
int success;
int num_ranges;
{
int success;
int num_ranges;