diff options
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc8568_mds.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ads.c | 7 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_cds.c | 7 | ||||
-rw-r--r-- | arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 7 |
4 files changed, 0 insertions, 22 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc8568_mds.c b/arch/powerpc/platforms/85xx/mpc8568_mds.c index 0861d1107bc8..324138a206a4 100644 --- a/arch/powerpc/platforms/85xx/mpc8568_mds.c +++ b/arch/powerpc/platforms/85xx/mpc8568_mds.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/console.h> | 27 | #include <linux/console.h> |
28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
29 | #include <linux/seq_file.h> | 29 | #include <linux/seq_file.h> |
30 | #include <linux/root_dev.h> | ||
31 | #include <linux/initrd.h> | 30 | #include <linux/initrd.h> |
32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
33 | #include <linux/fsl_devices.h> | 32 | #include <linux/fsl_devices.h> |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index c56fce57621c..741bcea8f991 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/kdev_t.h> | 17 | #include <linux/kdev_t.h> |
18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
19 | #include <linux/seq_file.h> | 19 | #include <linux/seq_file.h> |
20 | #include <linux/root_dev.h> | ||
21 | 20 | ||
22 | #include <asm/system.h> | 21 | #include <asm/system.h> |
23 | #include <asm/time.h> | 22 | #include <asm/time.h> |
@@ -245,12 +244,6 @@ static void __init mpc85xx_ads_setup_arch(void) | |||
245 | add_bridge(np); | 244 | add_bridge(np); |
246 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; | 245 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; |
247 | #endif | 246 | #endif |
248 | |||
249 | #ifdef CONFIG_ROOT_NFS | ||
250 | ROOT_DEV = Root_NFS; | ||
251 | #else | ||
252 | ROOT_DEV = Root_HDA1; | ||
253 | #endif | ||
254 | } | 247 | } |
255 | 248 | ||
256 | static void mpc85xx_ads_show_cpuinfo(struct seq_file *m) | 249 | static void mpc85xx_ads_show_cpuinfo(struct seq_file *m) |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index abc0aca6de40..bf6c60455a89 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/console.h> | 22 | #include <linux/console.h> |
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | #include <linux/seq_file.h> | 24 | #include <linux/seq_file.h> |
25 | #include <linux/root_dev.h> | ||
26 | #include <linux/initrd.h> | 25 | #include <linux/initrd.h> |
27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
28 | #include <linux/fsl_devices.h> | 27 | #include <linux/fsl_devices.h> |
@@ -263,12 +262,6 @@ static void __init mpc85xx_cds_setup_arch(void) | |||
263 | ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup; | 262 | ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup; |
264 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; | 263 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; |
265 | #endif | 264 | #endif |
266 | |||
267 | #ifdef CONFIG_ROOT_NFS | ||
268 | ROOT_DEV = Root_NFS; | ||
269 | #else | ||
270 | ROOT_DEV = Root_HDA1; | ||
271 | #endif | ||
272 | } | 265 | } |
273 | 266 | ||
274 | static void mpc85xx_cds_show_cpuinfo(struct seq_file *m) | 267 | static void mpc85xx_cds_show_cpuinfo(struct seq_file *m) |
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c index 7e237eb7a707..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> |
@@ -367,12 +366,6 @@ mpc86xx_hpcn_setup_arch(void) | |||
367 | 366 | ||
368 | printk("MPC86xx HPCN board from Freescale Semiconductor\n"); | 367 | printk("MPC86xx HPCN board from Freescale Semiconductor\n"); |
369 | 368 | ||
370 | #ifdef CONFIG_ROOT_NFS | ||
371 | ROOT_DEV = Root_NFS; | ||
372 | #else | ||
373 | ROOT_DEV = Root_HDA1; | ||
374 | #endif | ||
375 | |||
376 | #ifdef CONFIG_SMP | 369 | #ifdef CONFIG_SMP |
377 | mpc86xx_smp_init(); | 370 | mpc86xx_smp_init(); |
378 | #endif | 371 | #endif |