From 9a4be72b20bac2668eb5b484ae482735fc85bcc8 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Sat, 17 Feb 2007 09:25:57 -0600
Subject: [PATCH] --- yaml --- r: 48859 b: refs/heads/master c:
 1eccad01acaf7659abdcc9a72408456558bb4fb0 h: refs/heads/master i:   48857:
 0a184f8c8052bf39f4698e925f9f33445b5b385a   48855:
 501e72ecb2b2946fb9432a590c181e75377f6895 v: v3

---
 [refs]                                          |  2 +-
 trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c | 11 -----------
 trunk/arch/powerpc/platforms/83xx/mpc834x_itx.c |  6 ------
 trunk/arch/powerpc/platforms/83xx/mpc834x_mds.c |  6 ------
 trunk/arch/powerpc/platforms/83xx/mpc8360e_pb.c | 11 -----------
 5 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/[refs] b/[refs]
index fb68350876c0..4c2093a86e4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 336c3c2ec7e24bdf01c8f0c311ac7081b1f73d72
+refs/heads/master: 1eccad01acaf7659abdcc9a72408456558bb4fb0
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c b/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c
index c6bfe72893d4..71d9c0f17e47 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -118,17 +118,6 @@ static void __init mpc832x_sys_setup_arch(void)
 	}
 
 #endif				/* CONFIG_QUICC_ENGINE */
-
-#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
 }
 
 static int __init mpc832x_declare_of_platform_devices(void)
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc834x_itx.c b/trunk/arch/powerpc/platforms/83xx/mpc834x_itx.c
index a8f66fb3391a..0a708efa1f56 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -71,12 +71,6 @@ static void __init mpc834x_itx_setup_arch(void)
 
 	ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
-
-#ifdef  CONFIG_ROOT_NFS
-	ROOT_DEV = Root_NFS;
-#else
-	ROOT_DEV = Root_HDA1;
-#endif
 }
 
 static void __init mpc834x_itx_init_IRQ(void)
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc834x_mds.c b/trunk/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 9fd9adf8ff99..5a610485303b 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -144,12 +144,6 @@ static void __init mpc834x_mds_setup_arch(void)
 #endif
 
 	mpc834x_usb_cfg();
-
-#ifdef  CONFIG_ROOT_NFS
-	ROOT_DEV = Root_NFS;
-#else
-	ROOT_DEV = Root_HDA1;
-#endif
 }
 
 static void __init mpc834x_mds_init_IRQ(void)
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/trunk/arch/powerpc/platforms/83xx/mpc8360e_pb.c
index 76fcb5bdb759..e39e17f9b920 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc8360e_pb.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc8360e_pb.c
@@ -128,17 +128,6 @@ static void __init mpc8360_sys_setup_arch(void)
 	}
 
 #endif				/* CONFIG_QUICC_ENGINE */
-
-#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
 }
 
 static int __init mpc8360_declare_of_platform_devices(void)