iproute2: remove odd conffiles generation
[openwrt/svn-archive/archive.git] / target / linux / mpc85xx / patches-3.18 / 120-mpc8548_cds_i8259_noirq_init.patch
1 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
2 +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
3 @@ -247,15 +247,16 @@ static int mpc85xx_cds_8259_attach(void)
4 return -ENODEV;
5 }
6
7 + i8259_init(cascade_node, 0);
8 + of_node_put(cascade_node);
9 +
10 cascade_irq = irq_of_parse_and_map(cascade_node, 0);
11 if (cascade_irq == NO_IRQ) {
12 - printk(KERN_ERR "Failed to map cascade interrupt\n");
13 + of_node_put(cascade_node);
14 + printk(KERN_DEBUG "No interrupt for i8259 PIC\n");
15 return -ENXIO;
16 }
17
18 - i8259_init(cascade_node, 0);
19 - of_node_put(cascade_node);
20 -
21 /*
22 * Hook the interrupt to make sure desc->action is never NULL.
23 * This is required to ensure that the interrupt does not get