diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2007-10-14 00:13:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-14 11:56:33 -0400 |
commit | 24cf273e2b7186903c8842b9d0044ea442d31553 (patch) | |
tree | 08db8badd22a20ba2cfc20a0fe437f60f2b6fd14 /arch/powerpc | |
parent | 9ec0fd4e37c7167e4f9780d5834a1d1ed8263566 (diff) |
Lite5200 shouldn't mess with ROOT_DEV
There is no good reason for board platform code to mess with the ROOT_DEV.
Remove it from all in-tree platforms except powermac
This is a follow on to commit 745e1027751acbc1f14f8bbef378b491242b9c83.
The original patch had this change to lite5200.c, but it got dropped in
the psycho madness that is the 2.6.24 merge window.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/52xx/lite5200.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c index 774f2493e1ef..65b7ae426238 100644 --- a/arch/powerpc/platforms/52xx/lite5200.c +++ b/arch/powerpc/platforms/52xx/lite5200.c | |||
@@ -158,18 +158,6 @@ static void __init lite5200_setup_arch(void) | |||
158 | of_node_put(np); | 158 | of_node_put(np); |
159 | } | 159 | } |
160 | #endif | 160 | #endif |
161 | |||
162 | #ifdef CONFIG_BLK_DEV_INITRD | ||
163 | if (initrd_start) | ||
164 | ROOT_DEV = Root_RAM0; | ||
165 | else | ||
166 | #endif | ||
167 | #ifdef CONFIG_ROOT_NFS | ||
168 | ROOT_DEV = Root_NFS; | ||
169 | #else | ||
170 | ROOT_DEV = Root_HDA1; | ||
171 | #endif | ||
172 | |||
173 | } | 161 | } |
174 | 162 | ||
175 | /* | 163 | /* |