diff options
Diffstat (limited to 'arch/sparc/kernel/auxio_32.c')
| -rw-r--r-- | arch/sparc/kernel/auxio_32.c | 9 | 
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/sparc/kernel/auxio_32.c b/arch/sparc/kernel/auxio_32.c index e20cc55fb76..ae88c223e4d 100644 --- a/arch/sparc/kernel/auxio_32.c +++ b/arch/sparc/kernel/auxio_32.c @@ -9,12 +9,15 @@  #include <linux/of.h>  #include <linux/of_device.h>  #include <linux/export.h> +  #include <asm/oplib.h>  #include <asm/io.h>  #include <asm/auxio.h>  #include <asm/string.h>		/* memset(), Linux has no bzero() */  #include <asm/cpu_type.h> +#include "kernel.h" +  /* Probe and map in the Auxiliary I/O register */  /* auxio_register is not static because it is referenced  @@ -103,7 +106,7 @@ EXPORT_SYMBOL(set_auxio);  /* sun4m power control register (AUXIO2) */ -volatile unsigned char * auxio_power_register = NULL; +volatile u8 __iomem *auxio_power_register = NULL;  void __init auxio_power_probe(void)  { @@ -127,8 +130,8 @@ void __init auxio_power_probe(void)  	r.flags = regs.which_io & 0xF;  	r.start = regs.phys_addr;  	r.end = regs.phys_addr + regs.reg_size - 1; -	auxio_power_register = (unsigned char *) of_ioremap(&r, 0, -	    regs.reg_size, "auxpower"); +	auxio_power_register = +		(u8 __iomem *)of_ioremap(&r, 0, regs.reg_size, "auxpower");  	/* Display a quick message on the console. */  	if (auxio_power_register)  | 
