diff options
Diffstat (limited to 'arch/sparc/kernel/auxio_32.c')
-rw-r--r-- | arch/sparc/kernel/auxio_32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/auxio_32.c b/arch/sparc/kernel/auxio_32.c index ee8d214cae1e..acf5151f3c1d 100644 --- a/arch/sparc/kernel/auxio_32.c +++ b/arch/sparc/kernel/auxio_32.c | |||
@@ -23,7 +23,7 @@ static DEFINE_SPINLOCK(auxio_lock); | |||
23 | 23 | ||
24 | void __init auxio_probe(void) | 24 | void __init auxio_probe(void) |
25 | { | 25 | { |
26 | int node, auxio_nd; | 26 | phandle node, auxio_nd; |
27 | struct linux_prom_registers auxregs[1]; | 27 | struct linux_prom_registers auxregs[1]; |
28 | struct resource r; | 28 | struct resource r; |
29 | 29 | ||
@@ -101,7 +101,7 @@ void set_auxio(unsigned char bits_on, unsigned char bits_off) | |||
101 | break; | 101 | break; |
102 | default: | 102 | default: |
103 | panic("Can't set AUXIO register on this machine."); | 103 | panic("Can't set AUXIO register on this machine."); |
104 | }; | 104 | } |
105 | spin_unlock_irqrestore(&auxio_lock, flags); | 105 | spin_unlock_irqrestore(&auxio_lock, flags); |
106 | } | 106 | } |
107 | EXPORT_SYMBOL(set_auxio); | 107 | EXPORT_SYMBOL(set_auxio); |
@@ -113,7 +113,7 @@ volatile unsigned char * auxio_power_register = NULL; | |||
113 | void __init auxio_power_probe(void) | 113 | void __init auxio_power_probe(void) |
114 | { | 114 | { |
115 | struct linux_prom_registers regs; | 115 | struct linux_prom_registers regs; |
116 | int node; | 116 | phandle node; |
117 | struct resource r; | 117 | struct resource r; |
118 | 118 | ||
119 | /* Attempt to find the sun4m power control node. */ | 119 | /* Attempt to find the sun4m power control node. */ |
@@ -121,7 +121,7 @@ void __init auxio_power_probe(void) | |||
121 | node = prom_searchsiblings(node, "obio"); | 121 | node = prom_searchsiblings(node, "obio"); |
122 | node = prom_getchild(node); | 122 | node = prom_getchild(node); |
123 | node = prom_searchsiblings(node, "power"); | 123 | node = prom_searchsiblings(node, "power"); |
124 | if (node == 0 || node == -1) | 124 | if (node == 0 || (s32)node == -1) |
125 | return; | 125 | return; |
126 | 126 | ||
127 | /* Map the power control register. */ | 127 | /* Map the power control register. */ |