diff options
author | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
tree | 06a3183a562f8da4688f65023f7a18dcad702956 /arch/cris/arch-v10/kernel | |
parent | [AGPGART] Make AGP depend on PCI (diff) | |
parent | [PATCH] KConfig: Spellchecking 'similarity' and 'independent' (diff) | |
download | linux-dev-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz linux-dev-55b4d6a52195a8f277ffddf755ddaff359878f41.zip |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'arch/cris/arch-v10/kernel')
-rw-r--r-- | arch/cris/arch-v10/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c index 4b368a122015..2d5be93b5197 100644 --- a/arch/cris/arch-v10/kernel/irq.c +++ b/arch/cris/arch-v10/kernel/irq.c @@ -172,7 +172,7 @@ init_IRQ(void) /* Initialize IRQ handler descriptiors. */ for(i = 2; i < NR_IRQS; i++) { - irq_desc[i].handler = &crisv10_irq_type; + irq_desc[i].chip = &crisv10_irq_type; set_int_vector(i, interrupt[i]); } |