diff options
| author | Aneesh Kumar K.V <aneesh.kumar@gmail.com> | 2006-10-11 04:20:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:14:14 -0400 |
| commit | c37e108d156101dcde7ec7033eabe7abe83366bc (patch) | |
| tree | 2d576b612fc7939dab64279c36a1d0f0a016d38f /arch | |
| parent | 1db11ea65eaf1e7f6a70805fe52bc0aef53f68ef (diff) | |
[PATCH] use struct irq_chip instead of struct hw_interrupt_type
hw_interrupt_type is deprecated in favour of struct irq_chip.
[mingo@elte.hu: do x86_64 too]
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/io_apic.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/io_apic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index cd082c36ca03..27bceaf5ce40 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
| @@ -2594,7 +2594,7 @@ static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask) | |||
| 2594 | } | 2594 | } |
| 2595 | #endif | 2595 | #endif |
| 2596 | 2596 | ||
| 2597 | static struct hw_interrupt_type ht_irq_chip = { | 2597 | static struct irq_chip ht_irq_chip = { |
| 2598 | .name = "PCI-HT", | 2598 | .name = "PCI-HT", |
| 2599 | .mask = mask_ht_irq, | 2599 | .mask = mask_ht_irq, |
| 2600 | .unmask = unmask_ht_irq, | 2600 | .unmask = unmask_ht_irq, |
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 771bcf77daf2..c3cdcab29688 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c | |||
| @@ -1897,7 +1897,7 @@ static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask) | |||
| 1897 | } | 1897 | } |
| 1898 | #endif | 1898 | #endif |
| 1899 | 1899 | ||
| 1900 | static struct hw_interrupt_type ht_irq_chip = { | 1900 | static struct irq_chip ht_irq_chip = { |
| 1901 | .name = "PCI-HT", | 1901 | .name = "PCI-HT", |
| 1902 | .mask = mask_ht_irq, | 1902 | .mask = mask_ht_irq, |
| 1903 | .unmask = unmask_ht_irq, | 1903 | .unmask = unmask_ht_irq, |