mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-17 01:04:19 +08:00
[POWERPC] 8[56]xx: Remove obsolete setting of ROOT_DEV for 85xx and 86xx platforms.
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
a32525449b
commit
578f8f20f3
@ -27,7 +27,6 @@
|
|||||||
#include <linux/console.h>
|
#include <linux/console.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/root_dev.h>
|
|
||||||
#include <linux/initrd.h>
|
#include <linux/initrd.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/fsl_devices.h>
|
#include <linux/fsl_devices.h>
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
#include <linux/kdev_t.h>
|
#include <linux/kdev_t.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/root_dev.h>
|
|
||||||
|
|
||||||
#include <asm/system.h>
|
#include <asm/system.h>
|
||||||
#include <asm/time.h>
|
#include <asm/time.h>
|
||||||
@ -245,12 +244,6 @@ static void __init mpc85xx_ads_setup_arch(void)
|
|||||||
add_bridge(np);
|
add_bridge(np);
|
||||||
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
|
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ROOT_NFS
|
|
||||||
ROOT_DEV = Root_NFS;
|
|
||||||
#else
|
|
||||||
ROOT_DEV = Root_HDA1;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
|
static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
|
||||||
|
@ -22,7 +22,6 @@
|
|||||||
#include <linux/console.h>
|
#include <linux/console.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/root_dev.h>
|
|
||||||
#include <linux/initrd.h>
|
#include <linux/initrd.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/fsl_devices.h>
|
#include <linux/fsl_devices.h>
|
||||||
@ -263,12 +262,6 @@ static void __init mpc85xx_cds_setup_arch(void)
|
|||||||
ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
|
ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
|
||||||
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
|
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ROOT_NFS
|
|
||||||
ROOT_DEV = Root_NFS;
|
|
||||||
#else
|
|
||||||
ROOT_DEV = Root_HDA1;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)
|
static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#include <linux/kdev_t.h>
|
#include <linux/kdev_t.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/root_dev.h>
|
|
||||||
|
|
||||||
#include <asm/system.h>
|
#include <asm/system.h>
|
||||||
#include <asm/time.h>
|
#include <asm/time.h>
|
||||||
@ -365,12 +364,6 @@ mpc86xx_hpcn_setup_arch(void)
|
|||||||
|
|
||||||
printk("MPC86xx HPCN board from Freescale Semiconductor\n");
|
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
|
#ifdef CONFIG_SMP
|
||||||
mpc86xx_smp_init();
|
mpc86xx_smp_init();
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user