git.openpandora.org
/
pandora-kernel.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/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
sbus.c
diff --git
a/arch/sparc/kernel/sbus.c
b/arch/sparc/kernel/sbus.c
index
2ca32d1
..
a161b9c
100644
(file)
--- a/
arch/sparc/kernel/sbus.c
+++ b/
arch/sparc/kernel/sbus.c
@@
-97,7
+97,7
@@
void sbus_set_sbus64(struct device *dev, int bursts)
default:
return;
- }
;
+ }
val = upa_readq(cfg_reg);
if (val & (1UL << 14UL)) {
@@
-244,7
+244,7
@@
static unsigned int sbus_build_irq(struct platform_device *op, unsigned int ino)
case 3:
iclr = reg_base + SYSIO_ICLR_SLOT3;
break;
- }
;
+ }
iclr += ((unsigned long)sbus_level - 1UL) * 8UL;
}