X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fsparc%2Fkernel%2Fauxio.c;h=4bb41a1a3821a49de944880adc4442a5b4bd36d7;hb=352771d8dfacc828fdee58d5def490d5fb480c83;hp=44b6dd75ec58cc724e270cccb484c06ef43c6249;hpb=8acd6bd4f7d04a05c364bea1883ca3876efde353;p=linux-2.6.git

diff --git a/arch/sparc/kernel/auxio.c b/arch/sparc/kernel/auxio.c
index 44b6dd75e..4bb41a1a3 100644
--- a/arch/sparc/kernel/auxio.c
+++ b/arch/sparc/kernel/auxio.c
@@ -17,7 +17,7 @@
 /* auxio_register is not static because it is referenced 
  * in entry.S::floppy_tdone
  */
-unsigned long auxio_register = 0UL;
+void __iomem *auxio_register = NULL;
 static spinlock_t auxio_lock = SPIN_LOCK_UNLOCKED;
 
 void __init auxio_probe(void)
@@ -63,7 +63,7 @@ void __init auxio_probe(void)
 	/* Fix the address on sun4m and sun4c. */
 	if((((unsigned long) auxregs[0].phys_addr) & 3) == 3 ||
 	   sparc_cpu_model == sun4c)
-		auxio_register |= 3;
+		auxio_register += (3 - ((unsigned long)auxio_register & 3));
 
 	set_auxio(AUXIO_LED, 0);
 }