Merge branch 'linus' into locking-for-linus

[sfrench/cifs-2.6.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 08a030f85416c3e73d6131f5605d997403fa509c..4877516043000a42278eb13b2bef99e21696671a 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -796,6 +796,11 @@ int __init __weak early_irq_init(void)
        return 0;
 }
 
        return 0;
 }
 

+int __init __weak arch_probe_nr_irqs(void)
+{
+       return 0;
+}
+

 int __init __weak arch_early_irq_init(void)
 {
        return 0;
 int __init __weak arch_early_irq_init(void)
 {
        return 0;