aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/include/asm
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-08-04 16:49:52 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2009-09-01 17:23:32 +0200
commit0395ac6447c05e9393d4f8187ea6588b9d1daeb7 (patch)
treeab2f9a76a79c1d38b74dd7f3a39a39c0f135d387 /arch/cris/include/asm
parente6cd19743bfc76ca81804c2a259e3a0d7b03fd73 (diff)
CRIS: convert to asm-generic/hardirq.h
Convert CRIS to use asm-generic/hardirq.h Also remove unneeded (incorrect) prototypes for setup_irq(). Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/include/asm')
-rw-r--r--arch/cris/include/asm/hardirq.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/cris/include/asm/hardirq.h b/arch/cris/include/asm/hardirq.h
index 74178adeb1c..17bb12d760b 100644
--- a/arch/cris/include/asm/hardirq.h
+++ b/arch/cris/include/asm/hardirq.h
@@ -2,16 +2,6 @@
#define __ASM_HARDIRQ_H
#include <asm/irq.h>
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-typedef struct {
- unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
-void ack_bad_irq(unsigned int irq);
#define HARDIRQ_BITS 8
@@ -24,4 +14,6 @@ void ack_bad_irq(unsigned int irq);
# error HARDIRQ_BITS is too low!
#endif
+#include <asm-generic/hardirq.h>
+
#endif /* __ASM_HARDIRQ_H */