Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / sparc / kernel / setup_64.c

diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 5f72de67588b876989ec96243b03e633442ad59c..29bafe051bb172ab8878dbc960a65730eea9e7f3 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);