diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-30 01:57:46 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-30 01:57:46 +0200 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /arch/ia64/hp/sim/hpsim_irq.c | |
| parent | Pull acpica into release branch (diff) | |
| parent | [PATCH] usb gadget: fixup pxa2xx_udc to include asm/arch/udc.h again (diff) | |
| download | linux-d120cfb544ed6161b9d32fb6c4648c471807ee6b.tar.xz linux-d120cfb544ed6161b9d32fb6c4648c471807ee6b.zip | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'arch/ia64/hp/sim/hpsim_irq.c')
| -rw-r--r-- | arch/ia64/hp/sim/hpsim_irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c index c0d25a2a3e9c..8145547bb52d 100644 --- a/arch/ia64/hp/sim/hpsim_irq.c +++ b/arch/ia64/hp/sim/hpsim_irq.c @@ -44,8 +44,8 @@ hpsim_irq_init (void) int i; for (i = 0; i < NR_IRQS; ++i) { - idesc = irq_descp(i); - if (idesc->handler == &no_irq_type) - idesc->handler = &irq_type_hp_sim; + idesc = irq_desc + i; + if (idesc->chip == &no_irq_type) + idesc->chip = &irq_type_hp_sim; } } |