diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-26 20:23:22 +0200 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-27 00:35:32 +0200 |
| commit | 8e12a038f88e819c878e5697ff681cb08bcebb08 (patch) | |
| tree | 17f1cc49f53cbf37005ae5383304530fd66473b7 /arch/xtensa | |
| parent | blackfin: fix ifdef fustercluck in mach-bf538/boards/ezkit.c (diff) | |
| download | linux-8e12a038f88e819c878e5697ff681cb08bcebb08.tar.xz linux-8e12a038f88e819c878e5697ff681cb08bcebb08.zip | |
xtensa: fix build fail on undefined ack_bad_irq
Commit e520c410854bab763be24e0fce7ba89dc252efee
"xtensa: convert to asm-generic/hardirq.h"
converted over to using the asm-generic parts, but it also
added the sentinel
#define ack_bad_irq ack_bad_irq
which tells asm-generic to _not_ use the common ack_bad_irq.
Since e520c41 deleted the duplicated code from the arch specific
file, we _do_ want the asm-generic one in scope. So delete
the trigger define above which hides it. In doing so we'll
realize that we've got to delete the almost-duplicate prototype
as well to avoid "static declaration ... follows non-static".
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'arch/xtensa')
| -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 */ |