Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / sparc / kernel / auxio.c

diff --git a/arch/sparc/kernel/auxio.c b/arch/sparc/kernel/auxio.c
index 118f3eca373ea4bb70505a6a29cdb32c39375f26..09c857215a52fad2e2229ac6c86739eee4a6789b 100644 (file)
--- a/arch/sparc/kernel/auxio.c
+++ b/arch/sparc/kernel/auxio.c
@@ -6,6 +6,8 @@
 #include <linux/stddef.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <asm/oplib.h>
 #include <asm/io.h>
 #include <asm/auxio.h>
@@ -59,7 +61,7 @@ void __init auxio_probe(void)
        r.flags = auxregs[0].which_io & 0xF;
        r.start = auxregs[0].phys_addr;
        r.end = auxregs[0].phys_addr + auxregs[0].reg_size - 1;
-       auxio_register = sbus_ioremap(&r, 0, auxregs[0].reg_size, "auxio");
+       auxio_register = of_ioremap(&r, 0, auxregs[0].reg_size, "auxio");
        /* Fix the address on sun4m and sun4c. */
        if((((unsigned long) auxregs[0].phys_addr) & 3) == 3 ||
           sparc_cpu_model == sun4c)
@@ -88,7 +90,7 @@ void set_auxio(unsigned char bits_on, unsigned char bits_off)
                break;
        case sun4m:
                if(!auxio_register)
-                       break;     /* VME chassic sun4m, no auxio. */
+                       break;     /* VME chassis sun4m, no auxio. */
                regval = sbus_readb(auxio_register);
                sbus_writeb(((regval | bits_on) & ~bits_off) | AUXIO_ORMEIN4M,
                        auxio_register);
@@ -128,7 +130,7 @@ 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 *) sbus_ioremap(&r, 0,
+       auxio_power_register = (unsigned char *) of_ioremap(&r, 0,
            regs.reg_size, "auxpower");
 
        /* Display a quick message on the console. */