diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:01:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:01:00 -0500 |
commit | 050cbb09dac0402672edeaeac06094ef8ff1749a (patch) | |
tree | 89cbe4ac48e8e8f80ff5849e2cc33f045f5ccd52 /arch/avr32/kernel/irq.c | |
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/kernel/irq.c')
-rw-r--r-- | arch/avr32/kernel/irq.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/avr32/kernel/irq.c b/arch/avr32/kernel/irq.c index 9f572229d318..09904d22309f 100644 --- a/arch/avr32/kernel/irq.c +++ b/arch/avr32/kernel/irq.c | |||
@@ -16,15 +16,6 @@ | |||
16 | #include <linux/seq_file.h> | 16 | #include <linux/seq_file.h> |
17 | #include <linux/sysdev.h> | 17 | #include <linux/sysdev.h> |
18 | 18 | ||
19 | /* | ||
20 | * 'what should we do if we get a hw irq event on an illegal vector'. | ||
21 | * each architecture has to answer this themselves. | ||
22 | */ | ||
23 | void ack_bad_irq(unsigned int irq) | ||
24 | { | ||
25 | printk("unexpected IRQ %u\n", irq); | ||
26 | } | ||
27 | |||
28 | /* May be overridden by platform code */ | 19 | /* May be overridden by platform code */ |
29 | int __weak nmi_enable(void) | 20 | int __weak nmi_enable(void) |
30 | { | 21 | { |