diff options
Diffstat (limited to 'arch/mips/lantiq/irq.c')
-rw-r--r-- | arch/mips/lantiq/irq.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c index f9737bb3c5ab..d673731c538a 100644 --- a/arch/mips/lantiq/irq.c +++ b/arch/mips/lantiq/irq.c | |||
@@ -240,7 +240,6 @@ out: | |||
240 | 240 | ||
241 | static struct irqaction cascade = { | 241 | static struct irqaction cascade = { |
242 | .handler = no_action, | 242 | .handler = no_action, |
243 | .flags = IRQF_DISABLED, | ||
244 | .name = "cascade", | 243 | .name = "cascade", |
245 | }; | 244 | }; |
246 | 245 | ||
@@ -249,28 +248,28 @@ void __init arch_init_irq(void) | |||
249 | int i; | 248 | int i; |
250 | 249 | ||
251 | if (insert_resource(&iomem_resource, <q_icu_resource) < 0) | 250 | if (insert_resource(&iomem_resource, <q_icu_resource) < 0) |
252 | panic("Failed to insert icu memory\n"); | 251 | panic("Failed to insert icu memory"); |
253 | 252 | ||
254 | if (request_mem_region(ltq_icu_resource.start, | 253 | if (request_mem_region(ltq_icu_resource.start, |
255 | resource_size(<q_icu_resource), "icu") < 0) | 254 | resource_size(<q_icu_resource), "icu") < 0) |
256 | panic("Failed to request icu memory\n"); | 255 | panic("Failed to request icu memory"); |
257 | 256 | ||
258 | ltq_icu_membase = ioremap_nocache(ltq_icu_resource.start, | 257 | ltq_icu_membase = ioremap_nocache(ltq_icu_resource.start, |
259 | resource_size(<q_icu_resource)); | 258 | resource_size(<q_icu_resource)); |
260 | if (!ltq_icu_membase) | 259 | if (!ltq_icu_membase) |
261 | panic("Failed to remap icu memory\n"); | 260 | panic("Failed to remap icu memory"); |
262 | 261 | ||
263 | if (insert_resource(&iomem_resource, <q_eiu_resource) < 0) | 262 | if (insert_resource(&iomem_resource, <q_eiu_resource) < 0) |
264 | panic("Failed to insert eiu memory\n"); | 263 | panic("Failed to insert eiu memory"); |
265 | 264 | ||
266 | if (request_mem_region(ltq_eiu_resource.start, | 265 | if (request_mem_region(ltq_eiu_resource.start, |
267 | resource_size(<q_eiu_resource), "eiu") < 0) | 266 | resource_size(<q_eiu_resource), "eiu") < 0) |
268 | panic("Failed to request eiu memory\n"); | 267 | panic("Failed to request eiu memory"); |
269 | 268 | ||
270 | ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start, | 269 | ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start, |
271 | resource_size(<q_eiu_resource)); | 270 | resource_size(<q_eiu_resource)); |
272 | if (!ltq_eiu_membase) | 271 | if (!ltq_eiu_membase) |
273 | panic("Failed to remap eiu memory\n"); | 272 | panic("Failed to remap eiu memory"); |
274 | 273 | ||
275 | /* make sure all irqs are turned off by default */ | 274 | /* make sure all irqs are turned off by default */ |
276 | for (i = 0; i < 5; i++) | 275 | for (i = 0; i < 5; i++) |