diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/arm/mach-integrator/integrator_ap.c | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 191c57a3b997..72280754354d 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
| @@ -183,7 +183,7 @@ static void __init ap_init_irq(void) | |||
| 183 | for (i = 0; i < NR_IRQS; i++) { | 183 | for (i = 0; i < NR_IRQS; i++) { |
| 184 | if (((1 << i) & INTEGRATOR_SC_VALID_INT) != 0) { | 184 | if (((1 << i) & INTEGRATOR_SC_VALID_INT) != 0) { |
| 185 | set_irq_chip(i, &sc_chip); | 185 | set_irq_chip(i, &sc_chip); |
| 186 | set_irq_handler(i, do_level_IRQ); | 186 | set_irq_handler(i, handle_level_irq); |
| 187 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); | 187 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); |
| 188 | } | 188 | } |
| 189 | } | 189 | } |