diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /arch/mips/kernel/irq-rm9000.c | |
parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'arch/mips/kernel/irq-rm9000.c')
-rw-r--r-- | arch/mips/kernel/irq-rm9000.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c index 7b04583bd800..ed9febe63d72 100644 --- a/arch/mips/kernel/irq-rm9000.c +++ b/arch/mips/kernel/irq-rm9000.c | |||
@@ -75,6 +75,7 @@ static struct irq_chip rm9k_irq_controller = { | |||
75 | .mask = mask_rm9k_irq, | 75 | .mask = mask_rm9k_irq, |
76 | .mask_ack = mask_rm9k_irq, | 76 | .mask_ack = mask_rm9k_irq, |
77 | .unmask = unmask_rm9k_irq, | 77 | .unmask = unmask_rm9k_irq, |
78 | .eoi = unmask_rm9k_irq | ||
78 | }; | 79 | }; |
79 | 80 | ||
80 | static struct irq_chip rm9k_perfcounter_irq = { | 81 | static struct irq_chip rm9k_perfcounter_irq = { |