aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-02-17 10:25:57 -0500
committerKumar Gala <galak@kernel.crashing.org>2007-02-17 10:25:57 -0500
commit1eccad01acaf7659abdcc9a72408456558bb4fb0 (patch)
treeb010744013f714a70e0e1e231524196ed398e4c3 /arch/powerpc
parent336c3c2ec7e24bdf01c8f0c311ac7081b1f73d72 (diff)
[POWERPC] 83xx: Remove obsolete setting of ROOT_DEV.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/83xx/mpc832x_mds.c11
-rw-r--r--arch/powerpc/platforms/83xx/mpc834x_itx.c6
-rw-r--r--arch/powerpc/platforms/83xx/mpc834x_mds.c6
-rw-r--r--arch/powerpc/platforms/83xx/mpc8360e_pb.c11
4 files changed, 0 insertions, 34 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index c6bfe72893d4..71d9c0f17e47 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -118,17 +118,6 @@ static void __init mpc832x_sys_setup_arch(void)
118 } 118 }
119 119
120#endif /* CONFIG_QUICC_ENGINE */ 120#endif /* CONFIG_QUICC_ENGINE */
121
122#ifdef CONFIG_BLK_DEV_INITRD
123 if (initrd_start)
124 ROOT_DEV = Root_RAM0;
125 else
126#endif
127#ifdef CONFIG_ROOT_NFS
128 ROOT_DEV = Root_NFS;
129#else
130 ROOT_DEV = Root_HDA1;
131#endif
132} 121}
133 122
134static int __init mpc832x_declare_of_platform_devices(void) 123static int __init mpc832x_declare_of_platform_devices(void)
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index a8f66fb3391a..0a708efa1f56 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -71,12 +71,6 @@ static void __init mpc834x_itx_setup_arch(void)
71 71
72 ppc_md.pci_exclude_device = mpc83xx_exclude_device; 72 ppc_md.pci_exclude_device = mpc83xx_exclude_device;
73#endif 73#endif
74
75#ifdef CONFIG_ROOT_NFS
76 ROOT_DEV = Root_NFS;
77#else
78 ROOT_DEV = Root_HDA1;
79#endif
80} 74}
81 75
82static void __init mpc834x_itx_init_IRQ(void) 76static void __init mpc834x_itx_init_IRQ(void)
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 9fd9adf8ff99..5a610485303b 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -144,12 +144,6 @@ static void __init mpc834x_mds_setup_arch(void)
144#endif 144#endif
145 145
146 mpc834x_usb_cfg(); 146 mpc834x_usb_cfg();
147
148#ifdef CONFIG_ROOT_NFS
149 ROOT_DEV = Root_NFS;
150#else
151 ROOT_DEV = Root_HDA1;
152#endif
153} 147}
154 148
155static void __init mpc834x_mds_init_IRQ(void) 149static void __init mpc834x_mds_init_IRQ(void)
diff --git a/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/arch/powerpc/platforms/83xx/mpc8360e_pb.c
index 76fcb5bdb759..e39e17f9b920 100644
--- a/arch/powerpc/platforms/83xx/mpc8360e_pb.c
+++ b/arch/powerpc/platforms/83xx/mpc8360e_pb.c
@@ -128,17 +128,6 @@ static void __init mpc8360_sys_setup_arch(void)
128 } 128 }
129 129
130#endif /* CONFIG_QUICC_ENGINE */ 130#endif /* CONFIG_QUICC_ENGINE */
131
132#ifdef CONFIG_BLK_DEV_INITRD
133 if (initrd_start)
134 ROOT_DEV = Root_RAM0;
135 else
136#endif
137#ifdef CONFIG_ROOT_NFS
138 ROOT_DEV = Root_NFS;
139#else
140 ROOT_DEV = Root_HDA1;
141#endif
142} 131}
143 132
144static int __init mpc8360_declare_of_platform_devices(void) 133static int __init mpc8360_declare_of_platform_devices(void)