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 'fix/hda' into for-linus
[pandora-kernel.git]
/
arch
/
mips
/
mipssim
/
sim_int.c
diff --git
a/arch/mips/mipssim/sim_int.c
b/arch/mips/mipssim/sim_int.c
index
d86b372
..
5c779be
100644
(file)
--- a/
arch/mips/mipssim/sim_int.c
+++ b/
arch/mips/mipssim/sim_int.c
@@
-17,7
+17,6
@@
*/
#include <linux/init.h>
#include <linux/sched.h>
*/
#include <linux/init.h>
#include <linux/sched.h>
-#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
#include <asm/mips-boards/simint.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
#include <asm/mips-boards/simint.h>
@@
-25,7
+24,7
@@
static inline int clz(unsigned long x)
{
static inline int clz(unsigned long x)
{
- __asm__
(
+ __asm__(
" .set push \n"
" .set mips32 \n"
" clz %0, %1 \n"
" .set push \n"
" .set mips32 \n"
" clz %0, %1 \n"
@@
-77,7
+76,7
@@
asmlinkage void plat_irq_dispatch(void)
irq = irq_ffs(pending);
if (irq > 0)
irq = irq_ffs(pending);
if (irq > 0)
- do_IRQ(MIPS
CPU_INT
_BASE + irq);
+ do_IRQ(MIPS
_CPU_IRQ
_BASE + irq);
else
spurious_interrupt();
}
else
spurious_interrupt();
}