diff options
Diffstat (limited to 'arch/ia64/sn/kernel/irq.c')
-rw-r--r-- | arch/ia64/sn/kernel/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 764f26abac05..40d6eeda1c4b 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -295,13 +295,13 @@ unsigned int sn_local_vector_to_irq(u8 vector) | |||
295 | void sn_irq_init(void) | 295 | void sn_irq_init(void) |
296 | { | 296 | { |
297 | int i; | 297 | int i; |
298 | irq_desc_t *base_desc = irq_desc; | 298 | struct irq_desc *base_desc = irq_desc; |
299 | 299 | ||
300 | ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR; | 300 | ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR; |
301 | ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR; | 301 | ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR; |
302 | 302 | ||
303 | for (i = 0; i < NR_IRQS; i++) { | 303 | for (i = 0; i < NR_IRQS; i++) { |
304 | if (base_desc[i].chip == &no_irq_type) { | 304 | if (base_desc[i].chip == &no_irq_chip) { |
305 | base_desc[i].chip = &irq_type_sn; | 305 | base_desc[i].chip = &irq_type_sn; |
306 | } | 306 | } |
307 | } | 307 | } |
@@ -377,7 +377,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
377 | int cpu = nasid_slice_to_cpuid(nasid, slice); | 377 | int cpu = nasid_slice_to_cpuid(nasid, slice); |
378 | #ifdef CONFIG_SMP | 378 | #ifdef CONFIG_SMP |
379 | int cpuphys; | 379 | int cpuphys; |
380 | irq_desc_t *desc; | 380 | struct irq_desc *desc; |
381 | #endif | 381 | #endif |
382 | 382 | ||
383 | pci_dev_get(pci_dev); | 383 | pci_dev_get(pci_dev); |