diff options
author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/mips/ddb5xxx/ddb5477/irq_5477.c | |
parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) |
Merge branch 'merge'
Diffstat (limited to 'arch/mips/ddb5xxx/ddb5477/irq_5477.c')
-rw-r--r-- | arch/mips/ddb5xxx/ddb5477/irq_5477.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ddb5xxx/ddb5477/irq_5477.c b/arch/mips/ddb5xxx/ddb5477/irq_5477.c index 63c3d6534b3a..ba52705a2738 100644 --- a/arch/mips/ddb5xxx/ddb5477/irq_5477.c +++ b/arch/mips/ddb5xxx/ddb5477/irq_5477.c | |||
@@ -89,7 +89,7 @@ vrc5477_irq_end(unsigned int irq) | |||
89 | ll_vrc5477_irq_enable( irq - vrc5477_irq_base); | 89 | ll_vrc5477_irq_enable( irq - vrc5477_irq_base); |
90 | } | 90 | } |
91 | 91 | ||
92 | hw_irq_controller vrc5477_irq_controller = { | 92 | struct irq_chip vrc5477_irq_controller = { |
93 | .typename = "vrc5477_irq", | 93 | .typename = "vrc5477_irq", |
94 | .startup = vrc5477_irq_startup, | 94 | .startup = vrc5477_irq_startup, |
95 | .shutdown = vrc5477_irq_shutdown, | 95 | .shutdown = vrc5477_irq_shutdown, |