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-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs...
[pandora-kernel.git]
/
arch
/
m68k
/
mac
/
macints.c
diff --git
a/arch/m68k/mac/macints.c
b/arch/m68k/mac/macints.c
index
900d899
..
f92190c
100644
(file)
--- a/
arch/m68k/mac/macints.c
+++ b/
arch/m68k/mac/macints.c
@@
-370,7
+370,7
@@
int mac_irq_pending(unsigned int irq)
break;
case 4:
if (psc_present)
- psc_irq_pending(irq);
+
return
psc_irq_pending(irq);
break;
}
return 0;