diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-16 18:21:18 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-16 18:21:18 -0600 |
| commit | 834aba09598022f898eec651c0584b8b5d177e0a (patch) | |
| tree | 93a3982585d5ac06f5a5d3cba0b5afb0bd37118c /arch/powerpc/platforms/86xx | |
| parent | 00e402d06609d3722b018d696c12cb668065988d (diff) | |
| parent | 578f8f20f3c7e2c18083cf3bd434df994280af30 (diff) | |
Merge branch '85xx' into for_paulus
Diffstat (limited to 'arch/powerpc/platforms/86xx')
| -rw-r--r-- | arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c index 7e237eb7a70..f42f801cf84 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c @@ -18,7 +18,6 @@ #include <linux/kdev_t.h> #include <linux/delay.h> #include <linux/seq_file.h> -#include <linux/root_dev.h> #include <asm/system.h> #include <asm/time.h> @@ -367,12 +366,6 @@ mpc86xx_hpcn_setup_arch(void) printk("MPC86xx HPCN board from Freescale Semiconductor\n"); -#ifdef CONFIG_ROOT_NFS - ROOT_DEV = Root_NFS; -#else - ROOT_DEV = Root_HDA1; -#endif - #ifdef CONFIG_SMP mpc86xx_smp_init(); #endif |