summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/irq.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-28 09:30:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-28 09:30:20 +0100
commit661299d9d0437a0ff72240f3d60016ac3a361a6e (patch)
tree765512576314fc3612b503f182b9ae4e60fcf849 /include/asm-cris/irq.h
parent05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff)
parent41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff)
downloadlinux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz
linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.bz2
linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/asm-cris/irq.h')
-rw-r--r--include/asm-cris/irq.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/include/asm-cris/irq.h b/include/asm-cris/irq.h
index 87f342517bb1..8e787fdaedd4 100644
--- a/include/asm-cris/irq.h
+++ b/include/asm-cris/irq.h
@@ -8,16 +8,6 @@ extern __inline__ int irq_canonicalize(int irq)
return irq;
}
-extern void disable_irq(unsigned int);
-extern void enable_irq(unsigned int);
-
-#define disable_irq_nosync disable_irq
-#define enable_irq_nosync enable_irq
-
-struct irqaction;
-struct pt_regs;
-int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
-
#endif /* _ASM_IRQ_H */