diff options
Diffstat (limited to 'arch/powerpc/platforms/86xx/mpc86xx_hpcn.c')
-rw-r--r-- | arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c index f4dd5f2f8a28..f42f801cf84e 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/kdev_t.h> | 18 | #include <linux/kdev_t.h> |
19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
20 | #include <linux/seq_file.h> | 20 | #include <linux/seq_file.h> |
21 | #include <linux/root_dev.h> | ||
22 | 21 | ||
23 | #include <asm/system.h> | 22 | #include <asm/system.h> |
24 | #include <asm/time.h> | 23 | #include <asm/time.h> |
@@ -120,6 +119,8 @@ mpc86xx_hpcn_init_irq(void) | |||
120 | DBG("mpc86xxhpcn: cascade mapped to irq %d\n", cascade_irq); | 119 | DBG("mpc86xxhpcn: cascade mapped to irq %d\n", cascade_irq); |
121 | 120 | ||
122 | i8259_init(cascade_node, 0); | 121 | i8259_init(cascade_node, 0); |
122 | of_node_put(cascade_node); | ||
123 | |||
123 | set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade); | 124 | set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade); |
124 | #endif | 125 | #endif |
125 | } | 126 | } |
@@ -365,12 +366,6 @@ mpc86xx_hpcn_setup_arch(void) | |||
365 | 366 | ||
366 | printk("MPC86xx HPCN board from Freescale Semiconductor\n"); | 367 | printk("MPC86xx HPCN board from Freescale Semiconductor\n"); |
367 | 368 | ||
368 | #ifdef CONFIG_ROOT_NFS | ||
369 | ROOT_DEV = Root_NFS; | ||
370 | #else | ||
371 | ROOT_DEV = Root_HDA1; | ||
372 | #endif | ||
373 | |||
374 | #ifdef CONFIG_SMP | 369 | #ifdef CONFIG_SMP |
375 | mpc86xx_smp_init(); | 370 | mpc86xx_smp_init(); |
376 | #endif | 371 | #endif |