diff options
-rw-r--r-- | arch/parisc/kernel/irq.c | 2 | ||||
-rw-r--r-- | include/asm-parisc/irq.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 5b8803cc3d69..c53bfeb4bf94 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c | |||
@@ -209,7 +209,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
209 | ** Then use that to get the Transaction address and data. | 209 | ** Then use that to get the Transaction address and data. |
210 | */ | 210 | */ |
211 | 211 | ||
212 | int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *type, void *data) | 212 | int cpu_claim_irq(unsigned int irq, struct irq_chip *type, void *data) |
213 | { | 213 | { |
214 | if (irq_desc[irq].action) | 214 | if (irq_desc[irq].action) |
215 | return -EBUSY; | 215 | return -EBUSY; |
diff --git a/include/asm-parisc/irq.h b/include/asm-parisc/irq.h index 5cae260615a2..6e29cfa2812d 100644 --- a/include/asm-parisc/irq.h +++ b/include/asm-parisc/irq.h | |||
@@ -31,7 +31,7 @@ static __inline__ int irq_canonicalize(int irq) | |||
31 | return (irq == 2) ? 9 : irq; | 31 | return (irq == 2) ? 9 : irq; |
32 | } | 32 | } |
33 | 33 | ||
34 | struct hw_interrupt_type; | 34 | struct irq_chip; |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Some useful "we don't have to do anything here" handlers. Should | 37 | * Some useful "we don't have to do anything here" handlers. Should |
@@ -46,7 +46,7 @@ extern unsigned int txn_alloc_data(unsigned int); | |||
46 | extern unsigned long txn_alloc_addr(unsigned int); | 46 | extern unsigned long txn_alloc_addr(unsigned int); |
47 | extern unsigned long txn_affinity_addr(unsigned int irq, int cpu); | 47 | extern unsigned long txn_affinity_addr(unsigned int irq, int cpu); |
48 | 48 | ||
49 | extern int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *, void *); | 49 | extern int cpu_claim_irq(unsigned int irq, struct irq_chip *, void *); |
50 | extern int cpu_check_affinity(unsigned int irq, cpumask_t *dest); | 50 | extern int cpu_check_affinity(unsigned int irq, cpumask_t *dest); |
51 | 51 | ||
52 | /* soft power switch support (power.c) */ | 52 | /* soft power switch support (power.c) */ |