diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2006-08-14 04:25:45 +0200 |
|---|---|---|
| committer | Matthew Wilcox <willy@parisc-linux.org> | 2006-10-04 14:45:59 +0200 |
| commit | 5cfe87d3f543d05a84a509d232330261f1b7bccf (patch) | |
| tree | 9ff642a77258d18fac359c13359efd1d8155b605 | |
| parent | [PARISC] Add asm-parisc/mckinley.h bus header (diff) | |
| download | linux-5cfe87d3f543d05a84a509d232330261f1b7bccf.tar.xz linux-5cfe87d3f543d05a84a509d232330261f1b7bccf.zip | |
[PARISC] Fix up parisc irq handling for genirq changes
Clean up enough to get things compiling again in the interim.
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| -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) ** Then use that to get the Transaction address and data. */ -int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *type, void *data) +int cpu_claim_irq(unsigned int irq, struct irq_chip *type, void *data) { if (irq_desc[irq].action) 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) return (irq == 2) ? 9 : irq; } -struct hw_interrupt_type; +struct irq_chip; /* * Some useful "we don't have to do anything here" handlers. Should @@ -46,7 +46,7 @@ extern unsigned int txn_alloc_data(unsigned int); extern unsigned long txn_alloc_addr(unsigned int); extern unsigned long txn_affinity_addr(unsigned int irq, int cpu); -extern int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *, void *); +extern int cpu_claim_irq(unsigned int irq, struct irq_chip *, void *); extern int cpu_check_affinity(unsigned int irq, cpumask_t *dest); /* soft power switch support (power.c) */ |