diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 16:18:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 16:18:32 -0400 |
| commit | 84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b (patch) | |
| tree | 3272373e763d8e3ba5f7d7b0a7e18cd16eb178a8 /arch/avr32/include/asm | |
| parent | 5c55b40b27bc3249358dcfc86c0845be409ab7a6 (diff) | |
| parent | bb6e647051a59dca5a72b3deef1e061d7c1c34da (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: Fix oops on unaligned user access
avr32: Add support for Mediama RMTx add-on board for ATNGW100
avr32: Change Atmel ATNGW100 config to add choice of add-on board
Fix MIMC200 board LCD init
avr32: Fix clash in ATMEL_USART_ flags
avr32: remove obsolete hw_interrupt_type
avr32: Solves problem with inverted MCI detect pin on Merisc board
atmel-mci: Add support for inverted detect pin
Diffstat (limited to 'arch/avr32/include/asm')
| -rw-r--r-- | arch/avr32/include/asm/hw_irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/include/asm/hw_irq.h b/arch/avr32/include/asm/hw_irq.h index 218b0a6bfd1b..a36f9fcb8fcd 100644 --- a/arch/avr32/include/asm/hw_irq.h +++ b/arch/avr32/include/asm/hw_irq.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef __ASM_AVR32_HW_IRQ_H | 1 | #ifndef __ASM_AVR32_HW_IRQ_H |
| 2 | #define __ASM_AVR32_HW_IRQ_H | 2 | #define __ASM_AVR32_HW_IRQ_H |
| 3 | 3 | ||
| 4 | static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) | 4 | static inline void hw_resend_irq(struct irq_chip *h, unsigned int i) |
| 5 | { | 5 | { |
| 6 | /* Nothing to do */ | 6 | /* Nothing to do */ |
| 7 | } | 7 | } |