diff options
Diffstat (limited to 'arch/alpha/kernel/sys_marvel.c')
-rw-r--r-- | arch/alpha/kernel/sys_marvel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c index c5a1a2438c67..bbfc4f20ca72 100644 --- a/arch/alpha/kernel/sys_marvel.c +++ b/arch/alpha/kernel/sys_marvel.c | |||
@@ -169,7 +169,7 @@ marvel_irq_noop_return(unsigned int irq) | |||
169 | return 0; | 169 | return 0; |
170 | } | 170 | } |
171 | 171 | ||
172 | static struct hw_interrupt_type marvel_legacy_irq_type = { | 172 | static struct irq_chip marvel_legacy_irq_type = { |
173 | .typename = "LEGACY", | 173 | .typename = "LEGACY", |
174 | .startup = marvel_irq_noop_return, | 174 | .startup = marvel_irq_noop_return, |
175 | .shutdown = marvel_irq_noop, | 175 | .shutdown = marvel_irq_noop, |
@@ -179,7 +179,7 @@ static struct hw_interrupt_type marvel_legacy_irq_type = { | |||
179 | .end = marvel_irq_noop, | 179 | .end = marvel_irq_noop, |
180 | }; | 180 | }; |
181 | 181 | ||
182 | static struct hw_interrupt_type io7_lsi_irq_type = { | 182 | static struct irq_chip io7_lsi_irq_type = { |
183 | .typename = "LSI", | 183 | .typename = "LSI", |
184 | .startup = io7_startup_irq, | 184 | .startup = io7_startup_irq, |
185 | .shutdown = io7_disable_irq, | 185 | .shutdown = io7_disable_irq, |
@@ -189,7 +189,7 @@ static struct hw_interrupt_type io7_lsi_irq_type = { | |||
189 | .end = io7_end_irq, | 189 | .end = io7_end_irq, |
190 | }; | 190 | }; |
191 | 191 | ||
192 | static struct hw_interrupt_type io7_msi_irq_type = { | 192 | static struct irq_chip io7_msi_irq_type = { |
193 | .typename = "MSI", | 193 | .typename = "MSI", |
194 | .startup = io7_startup_irq, | 194 | .startup = io7_startup_irq, |
195 | .shutdown = io7_disable_irq, | 195 | .shutdown = io7_disable_irq, |
@@ -273,8 +273,8 @@ init_one_io7_msi(struct io7 *io7, unsigned int which, unsigned int where) | |||
273 | 273 | ||
274 | static void __init | 274 | static void __init |
275 | init_io7_irqs(struct io7 *io7, | 275 | init_io7_irqs(struct io7 *io7, |
276 | struct hw_interrupt_type *lsi_ops, | 276 | struct irq_chip *lsi_ops, |
277 | struct hw_interrupt_type *msi_ops) | 277 | struct irq_chip *msi_ops) |
278 | { | 278 | { |
279 | long base = (io7->pe << MARVEL_IRQ_VEC_PE_SHIFT) + 16; | 279 | long base = (io7->pe << MARVEL_IRQ_VEC_PE_SHIFT) + 16; |
280 | long i; | 280 | long i; |