projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with Linus' kernel.
[cascardo/linux.git]
/
include
/
asm-mips
/
irq.h
diff --git
a/include/asm-mips/irq.h
b/include/asm-mips/irq.h
index
3f2470e
..
8a342cc
100644
(file)
--- a/
include/asm-mips/irq.h
+++ b/
include/asm-mips/irq.h
@@
-24,11
+24,9
@@
static inline int irq_canonicalize(int irq)
struct pt_regs;
-#ifdef CONFIG_PREEMPT
-
extern asmlinkage unsigned int do_IRQ(unsigned int irq, struct pt_regs *regs);
-#
else
+#
ifdef CONFIG_PREEMPT
/*
* do_IRQ handles all normal device IRQ's (the special