diff options
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ds.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c index b010dc9dec65..8b2d63d4264e 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c | |||
@@ -58,14 +58,13 @@ void __init mpc85xx_ds_pic_init(void) | |||
58 | { | 58 | { |
59 | struct mpic *mpic; | 59 | struct mpic *mpic; |
60 | struct resource r; | 60 | struct resource r; |
61 | struct device_node *np = NULL; | 61 | struct device_node *np; |
62 | #ifdef CONFIG_PPC_I8259 | 62 | #ifdef CONFIG_PPC_I8259 |
63 | struct device_node *cascade_node = NULL; | 63 | struct device_node *cascade_node = NULL; |
64 | int cascade_irq; | 64 | int cascade_irq; |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | np = of_find_node_by_type(np, "open-pic"); | 67 | np = of_find_node_by_type(np, "open-pic"); |
68 | |||
69 | if (np == NULL) { | 68 | if (np == NULL) { |
70 | printk(KERN_ERR "Could not find open-pic node\n"); | 69 | printk(KERN_ERR "Could not find open-pic node\n"); |
71 | return; | 70 | return; |
@@ -82,6 +81,7 @@ void __init mpc85xx_ds_pic_init(void) | |||
82 | MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS, | 81 | MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS, |
83 | 0, 256, " OpenPIC "); | 82 | 0, 256, " OpenPIC "); |
84 | BUG_ON(mpic == NULL); | 83 | BUG_ON(mpic == NULL); |
84 | of_node_put(np); | ||
85 | 85 | ||
86 | mpic_init(mpic); | 86 | mpic_init(mpic); |
87 | 87 | ||
@@ -185,7 +185,7 @@ static int __init mpc8544_ds_probe(void) | |||
185 | } | 185 | } |
186 | } | 186 | } |
187 | 187 | ||
188 | static struct of_device_id mpc85xxds_ids[] = { | 188 | static struct of_device_id __initdata mpc85xxds_ids[] = { |
189 | { .type = "soc", }, | 189 | { .type = "soc", }, |
190 | { .compatible = "soc", }, | 190 | { .compatible = "soc", }, |
191 | {}, | 191 | {}, |