Merge branch 'linus' into x86/x2apic

[linux-2.6-block.git] / include / linux / irq.h

diff --git a/include/linux/irq.h b/include/linux/irq.h
index c211984b55e548477ddcecd972a04317295af6de..8d9411bc60f6f9356e0237cc601330576283d22a 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -245,15 +245,6 @@ static inline void set_balance_irq_affinity(unsigned int irq, cpumask_t mask)
 }
 #endif
 
-#ifdef CONFIG_AUTO_IRQ_AFFINITY
-extern int select_smp_affinity(unsigned int irq);
-#else
-static inline int select_smp_affinity(unsigned int irq)
-{
-       return 1;
-}
-#endif
-
 extern int no_irq_affinity;
 
 static inline int irq_balancing_disabled(unsigned int irq)