diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:08:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:08:56 -0700 |
commit | 5f8fe4270e53d38421ba34c428c3b58933b48e50 (patch) | |
tree | 2148a3ba1ec842d0d0ad8f3e3eb209eb6eba673d /arch/cris/include/asm/hardirq.h | |
parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | CRIS: Cleanup linker script using new linker script macros. (diff) | |
download | linux-dev-5f8fe4270e53d38421ba34c428c3b58933b48e50.tar.xz linux-dev-5f8fe4270e53d38421ba34c428c3b58933b48e50.zip |
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror:
CRIS: Cleanup linker script using new linker script macros.
ARRAY_SIZE changes
CRIS: convert to asm-generic/hardirq.h
CRISv10: Don't autonegotiate if autonegotiation is off
CRIS: fix defconfig build failure
CRIS: add pgprot_noncached
Diffstat (limited to 'arch/cris/include/asm/hardirq.h')
-rw-r--r-- | arch/cris/include/asm/hardirq.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/cris/include/asm/hardirq.h b/arch/cris/include/asm/hardirq.h index 74178adeb1cd..17bb12d760b2 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 */ |