]> err.no Git - linux-2.6/commitdiff
Lite5200 shouldn't mess with ROOT_DEV
authorGrant Likely <grant.likely@secretlab.ca>
Sun, 14 Oct 2007 04:13:27 +0000 (22:13 -0600)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 14 Oct 2007 15:56:33 +0000 (08:56 -0700)
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>
arch/powerpc/platforms/52xx/lite5200.c

index 774f2493e1ef675ecb9efb5a9abcc32684335882..65b7ae4262381a2b9830dd1ecbb5a487a6a56063 100644 (file)
@@ -158,18 +158,6 @@ static void __init lite5200_setup_arch(void)
                of_node_put(np);
        }
 #endif
-
-#ifdef CONFIG_BLK_DEV_INITRD
-       if (initrd_start)
-               ROOT_DEV = Root_RAM0;
-       else
-#endif
-#ifdef  CONFIG_ROOT_NFS
-               ROOT_DEV = Root_NFS;
-#else
-               ROOT_DEV = Root_HDA1;
-#endif
-
 }
 
 /*