diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-10 04:32:01 +0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-10 04:32:01 +0400 |
commit | 3aa450c063e29b4f4b622480e1779e5e256d8f8f (patch) | |
tree | d18942ff8bf862f2973f4e7adbf99c4f3e22a563 /arch/xtensa/include/asm/hardirq.h | |
parent | d57a4282d04810417c4ed2a49cbbeda8b3569b18 (diff) | |
parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
download | linux-3aa450c063e29b4f4b622480e1779e5e256d8f8f.tar.xz |
Merge tag 'v3.4-rc6' into spi/next
Linux 3.4-rc6
Diffstat (limited to 'arch/xtensa/include/asm/hardirq.h')
-rw-r--r-- | arch/xtensa/include/asm/hardirq.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/hardirq.h b/arch/xtensa/include/asm/hardirq.h index 26664cef8f11..91695a135498 100644 --- a/arch/xtensa/include/asm/hardirq.h +++ b/arch/xtensa/include/asm/hardirq.h @@ -11,9 +11,6 @@ #ifndef _XTENSA_HARDIRQ_H #define _XTENSA_HARDIRQ_H -void ack_bad_irq(unsigned int irq); -#define ack_bad_irq ack_bad_irq - #include <asm-generic/hardirq.h> #endif /* _XTENSA_HARDIRQ_H */ |