diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:01:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:01:00 -0800 |
| commit | 050cbb09dac0402672edeaeac06094ef8ff1749a (patch) | |
| tree | 89cbe4ac48e8e8f80ff5849e2cc33f045f5ccd52 /arch/avr32/include/asm | |
| parent | 17c330f98383629cfd359ee62b3adde1d2a3ff7c (diff) | |
| parent | 0386f9e68fc92a3650088b86d908b07de4fb1744 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006
avr32: add default configurations for ATNGW100 mkII and EVKLCD10X
avr32: add support for ATNGW100 mkII board
avr32: convert to asm-generic/hardirq.h
avr32: add two new at91 to cpu.h definition
avr32: clean up linker script using standard macros.
avr32: MRMT: correct setup of SPI slaves
avr32: function for independently setting up SPI slaves
avr32: re-instate MCI WP/CD pin assignments for ATNGW100
Diffstat (limited to 'arch/avr32/include/asm')
| -rw-r--r-- | arch/avr32/include/asm/hardirq.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/avr32/include/asm/hardirq.h b/arch/avr32/include/asm/hardirq.h index 015bc75ea79..9e36e3ff77d 100644 --- a/arch/avr32/include/asm/hardirq.h +++ b/arch/avr32/include/asm/hardirq.h @@ -1,23 +1,6 @@ #ifndef __ASM_AVR32_HARDIRQ_H #define __ASM_AVR32_HARDIRQ_H - -#include <linux/threads.h> -#include <asm/irq.h> - #ifndef __ASSEMBLY__ - -#include <linux/cache.h> - -/* entry.S is sensitive to the offsets of these fields */ -typedef struct { - unsigned int __softirq_pending; -} ____cacheline_aligned irq_cpustat_t; - -void ack_bad_irq(unsigned int irq); - -/* Standard mappings for irq_cpustat_t above */ -#include <linux/irq_cpustat.h> - +#include <asm-generic/hardirq.h> #endif /* __ASSEMBLY__ */ - #endif /* __ASM_AVR32_HARDIRQ_H */ |