diff options
-rw-r--r-- | arch/frv/kernel/irq-mb93093.c | 1 | ||||
-rw-r--r-- | arch/frv/kernel/irq.c | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/frv/kernel/irq-mb93093.c b/arch/frv/kernel/irq-mb93093.c index e45209031873..6451c2f1c15e 100644 --- a/arch/frv/kernel/irq-mb93093.c +++ b/arch/frv/kernel/irq-mb93093.c | |||
@@ -73,7 +73,6 @@ static struct irq_chip frv_fpga_pic = { | |||
73 | .mask = frv_fpga_mask, | 73 | .mask = frv_fpga_mask, |
74 | .mask_ack = frv_fpga_mask_ack, | 74 | .mask_ack = frv_fpga_mask_ack, |
75 | .unmask = frv_fpga_unmask, | 75 | .unmask = frv_fpga_unmask, |
76 | .end = frv_fpga_end, | ||
77 | }; | 76 | }; |
78 | 77 | ||
79 | /* | 78 | /* |
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c index 625136625a7f..d4ec2c6adb0f 100644 --- a/arch/frv/kernel/irq.c +++ b/arch/frv/kernel/irq.c | |||
@@ -118,18 +118,12 @@ static void frv_cpupic_unmask(unsigned int irqlevel) | |||
118 | __clr_MASK(irqlevel); | 118 | __clr_MASK(irqlevel); |
119 | } | 119 | } |
120 | 120 | ||
121 | static void frv_cpupic_end(unsigned int irqlevel) | ||
122 | { | ||
123 | __clr_MASK(irqlevel); | ||
124 | } | ||
125 | |||
126 | static struct irq_chip frv_cpu_pic = { | 121 | static struct irq_chip frv_cpu_pic = { |
127 | .name = "cpu", | 122 | .name = "cpu", |
128 | .ack = frv_cpupic_ack, | 123 | .ack = frv_cpupic_ack, |
129 | .mask = frv_cpupic_mask, | 124 | .mask = frv_cpupic_mask, |
130 | .mask_ack = frv_cpupic_mask_ack, | 125 | .mask_ack = frv_cpupic_mask_ack, |
131 | .unmask = frv_cpupic_unmask, | 126 | .unmask = frv_cpupic_unmask, |
132 | .end = frv_cpupic_end, | ||
133 | }; | 127 | }; |
134 | 128 | ||
135 | /* | 129 | /* |