projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
[cascardo/linux.git]
/
arch
/
sparc
/
kernel
/
setup_64.c
diff --git
a/arch/sparc/kernel/setup_64.c
b/arch/sparc/kernel/setup_64.c
index
5f72de6
..
29bafe0
100644
(file)
--- a/
arch/sparc/kernel/setup_64.c
+++ b/
arch/sparc/kernel/setup_64.c
@@
-315,7
+315,7
@@
void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_IP_PNP
if (!ic_set_manually) {
-
int chosen = prom_finddevice
("/chosen");
+
phandle chosen = prom_finddevice
("/chosen");
u32 cl, sv, gw;
cl = prom_getintdefault (chosen, "client-ip", 0);