diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/mips/ite-boards/generic/irq.c | |
parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/mips/ite-boards/generic/irq.c')
-rw-r--r-- | arch/mips/ite-boards/generic/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/ite-boards/generic/irq.c b/arch/mips/ite-boards/generic/irq.c index a6749c56fe38..cb59ca4f76f0 100644 --- a/arch/mips/ite-boards/generic/irq.c +++ b/arch/mips/ite-boards/generic/irq.c | |||
@@ -133,7 +133,7 @@ static void end_ite_irq(unsigned int irq) | |||
133 | enable_it8172_irq(irq); | 133 | enable_it8172_irq(irq); |
134 | } | 134 | } |
135 | 135 | ||
136 | static struct hw_interrupt_type it8172_irq_type = { | 136 | static struct irq_chip it8172_irq_type = { |
137 | .typename = "ITE8172", | 137 | .typename = "ITE8172", |
138 | .startup = startup_ite_irq, | 138 | .startup = startup_ite_irq, |
139 | .shutdown = shutdown_ite_irq, | 139 | .shutdown = shutdown_ite_irq, |
@@ -153,7 +153,7 @@ static void ack_none(unsigned int irq) { } | |||
153 | #define shutdown_none disable_none | 153 | #define shutdown_none disable_none |
154 | #define end_none enable_none | 154 | #define end_none enable_none |
155 | 155 | ||
156 | static struct hw_interrupt_type cp0_irq_type = { | 156 | static struct irq_chip cp0_irq_type = { |
157 | .typename = "CP0 Count", | 157 | .typename = "CP0 Count", |
158 | .startup = startup_none, | 158 | .startup = startup_none, |
159 | .shutdown = shutdown_none, | 159 | .shutdown = shutdown_none, |