aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/include/asm/hardirq.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-21 12:45:18 +0200
committerTakashi Iwai <tiwai@suse.de>2012-05-21 12:45:18 +0200
commit775b2449bdba7c97dda9f274c92bf7a83dac4142 (patch)
treeb4bee45c13762ea93642b1e38c62de454e51cf5d /arch/xtensa/include/asm/hardirq.h
parentMerge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus (diff)
parentARM: mx31_3ds: Add sound support (diff)
downloadlinux-dev-775b2449bdba7c97dda9f274c92bf7a83dac4142.tar.xz
linux-dev-775b2449bdba7c97dda9f274c92bf7a83dac4142.zip
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/xtensa/include/asm/hardirq.h')
-rw-r--r--arch/xtensa/include/asm/hardirq.h3
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 */