diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /arch/ia64/hp/sim/hpsim_irq.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
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) | |||
| 44 | int i; | 44 | int i; |
| 45 | 45 | ||
| 46 | for (i = 0; i < NR_IRQS; ++i) { | 46 | for (i = 0; i < NR_IRQS; ++i) { |
| 47 | idesc = irq_descp(i); | 47 | idesc = irq_desc + i; |
| 48 | if (idesc->handler == &no_irq_type) | 48 | if (idesc->chip == &no_irq_type) |
| 49 | idesc->handler = &irq_type_hp_sim; | 49 | idesc->chip = &irq_type_hp_sim; |
| 50 | } | 50 | } |
| 51 | } | 51 | } |