diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-06-12 23:12:52 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-12 23:12:52 -0400 |
| commit | af68d8f06d7a4f62f647820bf3c6b390f9aef954 (patch) | |
| tree | 365e21aa1a24f2bdaf1dcb2dbb6272d6b255eb77 /arch/sh/kernel | |
| parent | d978006a54ddf73cdeb3c59d1862a17f4445751c (diff) | |
| parent | 76b386624576eb00a7c7cad0e713952121708598 (diff) | |
Merge branch 'sh/genirq' into sh-latest
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/irq.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index dadce735f746..063af10ff3c1 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c | |||
| @@ -231,16 +231,6 @@ void __init init_IRQ(void) | |||
| 231 | irq_ctx_init(smp_processor_id()); | 231 | irq_ctx_init(smp_processor_id()); |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | #ifdef CONFIG_SPARSE_IRQ | ||
| 235 | int __init arch_probe_nr_irqs(void) | ||
| 236 | { | ||
| 237 | /* | ||
| 238 | * No pre-allocated IRQs. | ||
| 239 | */ | ||
| 240 | return 0; | ||
| 241 | } | ||
| 242 | #endif | ||
| 243 | |||
| 244 | #ifdef CONFIG_HOTPLUG_CPU | 234 | #ifdef CONFIG_HOTPLUG_CPU |
| 245 | static void route_irq(struct irq_data *data, unsigned int irq, unsigned int cpu) | 235 | static void route_irq(struct irq_data *data, unsigned int irq, unsigned int cpu) |
| 246 | { | 236 | { |