diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/hp/sim/hpsim_irq.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/iosapic.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/irq.c | 2 |
3 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 acb5047ab573..17e5832fe0dc 100644 --- a/arch/ia64/hp/sim/hpsim_irq.c +++ b/arch/ia64/hp/sim/hpsim_irq.c | |||
@@ -46,7 +46,7 @@ hpsim_irq_init (void) | |||
46 | 46 | ||
47 | for (i = 0; i < NR_IRQS; ++i) { | 47 | for (i = 0; i < NR_IRQS; ++i) { |
48 | idesc = irq_desc + i; | 48 | idesc = irq_desc + i; |
49 | if (idesc->chip == &no_irq_type) | 49 | if (idesc->chip == &no_irq_chip) |
50 | idesc->chip = &irq_type_hp_sim; | 50 | idesc->chip = &irq_type_hp_sim; |
51 | } | 51 | } |
52 | } | 52 | } |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index f92cef47bf86..0900be60fc3a 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
@@ -650,7 +650,7 @@ register_intr (unsigned int gsi, int irq, unsigned char delivery, | |||
650 | 650 | ||
651 | idesc = irq_desc + irq; | 651 | idesc = irq_desc + irq; |
652 | if (irq_type != NULL && idesc->chip != irq_type) { | 652 | if (irq_type != NULL && idesc->chip != irq_type) { |
653 | if (idesc->chip != &no_irq_type) | 653 | if (idesc->chip != &no_irq_chip) |
654 | printk(KERN_WARNING | 654 | printk(KERN_WARNING |
655 | "%s: changing vector %d from %s to %s\n", | 655 | "%s: changing vector %d from %s to %s\n", |
656 | __func__, irq_to_vector(irq), | 656 | __func__, irq_to_vector(irq), |
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 764f26abac05..e117f19c7925 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -301,7 +301,7 @@ void sn_irq_init(void) | |||
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 | } |