Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / asm-ia64 / hardirq.h

diff --git a/include/asm-ia64/hardirq.h b/include/asm-ia64/hardirq.h
index b097596..140e495 100644 (file)
--- a/include/asm-ia64/hardirq.h
+++ b/include/asm-ia64/hardirq.h
@@ -6,7 +6,6 @@
  *     David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
-#include <linux/config.h>
 
 #include <linux/threads.h>
 #include <linux/irq.h>
@@ -19,7 +18,6 @@
 
 #define __ARCH_IRQ_STAT        1
 
-#define softirq_pending(cpu)           (cpu_data(cpu)->softirq_pending)
 #define local_softirq_pending()                (local_cpu_data->softirq_pending)
 
 #define HARDIRQ_BITS   14
@@ -34,4 +32,6 @@
 
 extern void __iomem *ipi_base_addr;
 
+void ack_bad_irq(unsigned int irq);
+
 #endif /* _ASM_IA64_HARDIRQ_H */