From d09ecfd9f33545640dcf79309d7d75714273a1f7 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Sat, 13 Oct 2007 22:13:27 -0600 Subject: [PATCH] --- yaml --- r: 68611 b: refs/heads/master c: 24cf273e2b7186903c8842b9d0044ea442d31553 h: refs/heads/master i: 68609: bf6b6ad63a384a9bb5ae1b19769457e4ac0e2f27 68607: 55b50b910eceaa64163a1eade6d44ed3fb21e653 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/52xx/lite5200.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 58bb84938651..e828102942bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ec0fd4e37c7167e4f9780d5834a1d1ed8263566 +refs/heads/master: 24cf273e2b7186903c8842b9d0044ea442d31553 diff --git a/trunk/arch/powerpc/platforms/52xx/lite5200.c b/trunk/arch/powerpc/platforms/52xx/lite5200.c index 774f2493e1ef..65b7ae426238 100644 --- a/trunk/arch/powerpc/platforms/52xx/lite5200.c +++ b/trunk/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 - } /*