From 1708bac590b80e4a8148e8a3c44f9c7b29d779a9 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Sat, 13 Oct 2007 22:13:27 -0600 Subject: [PATCH] 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 5fe0dd505a2d378d48549a59e658a6e4b163894f. 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 Signed-off-by: Linus Torvalds --- arch/powerpc/platforms/52xx/lite5200.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c index 774f2493e1ef6..65b7ae4262381 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) 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 - } /* -- 2.39.5