git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
arch
/
sparc
/
kernel
/
auxio.c
diff --git
a/arch/sparc/kernel/auxio.c
b/arch/sparc/kernel/auxio.c
index 118f3eca373ea4bb70505a6a29cdb32c39375f26..baf4ed3fb0f3d116f6966c48a93a6b7551884bc0 100644
(file)
--- a/
arch/sparc/kernel/auxio.c
+++ b/
arch/sparc/kernel/auxio.c
@@
-88,7
+88,7
@@
void set_auxio(unsigned char bits_on, unsigned char bits_off)
break;
case sun4m:
if(!auxio_register)
- break; /* VME chassi
c
sun4m, no auxio. */
+ break; /* VME chassi
s
sun4m, no auxio. */
regval = sbus_readb(auxio_register);
sbus_writeb(((regval | bits_on) & ~bits_off) | AUXIO_ORMEIN4M,
auxio_register);