From 84a4a5591e9c28bc36a7596065b437baaa411cb4 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Fri, 25 Jan 2008 10:23:34 -0600
Subject: [PATCH] --- yaml --- r: 81392 b: refs/heads/master c:
 f67be814ff8e862422739cb424ce8c4e6c142c28 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/boot/dts/stx_gp3_8560.dts | 2 +-
 trunk/arch/powerpc/boot/dts/tqm8540.dts      | 2 +-
 trunk/arch/powerpc/boot/dts/tqm8541.dts      | 2 +-
 trunk/arch/powerpc/boot/dts/tqm8555.dts      | 2 +-
 trunk/arch/powerpc/boot/dts/tqm8560.dts      | 2 +-
 trunk/arch/powerpc/platforms/85xx/stx_gp3.c  | 4 ----
 trunk/arch/powerpc/platforms/85xx/tqm85xx.c  | 4 ----
 8 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index bebafdb31654..47390a53d14f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eedd62ed53512e6749764427ffe5a1c9e41175c6
+refs/heads/master: f67be814ff8e862422739cb424ce8c4e6c142c28
diff --git a/trunk/arch/powerpc/boot/dts/stx_gp3_8560.dts b/trunk/arch/powerpc/boot/dts/stx_gp3_8560.dts
index 2e9723604148..f81fd7fdb29e 100644
--- a/trunk/arch/powerpc/boot/dts/stx_gp3_8560.dts
+++ b/trunk/arch/powerpc/boot/dts/stx_gp3_8560.dts
@@ -46,7 +46,7 @@
 		reg = <0x00000000 0x10000000>;
 	};
 
-	soc8560@fdf00000 {
+	soc@fdf00000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
diff --git a/trunk/arch/powerpc/boot/dts/tqm8540.dts b/trunk/arch/powerpc/boot/dts/tqm8540.dts
index a6e39897e1cc..1addb3ae719e 100644
--- a/trunk/arch/powerpc/boot/dts/tqm8540.dts
+++ b/trunk/arch/powerpc/boot/dts/tqm8540.dts
@@ -48,7 +48,7 @@
 		reg = <0x00000000 0x10000000>;
 	};
 
-	soc8540@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
diff --git a/trunk/arch/powerpc/boot/dts/tqm8541.dts b/trunk/arch/powerpc/boot/dts/tqm8541.dts
index 11bdb0fe50f4..9e01093f496e 100644
--- a/trunk/arch/powerpc/boot/dts/tqm8541.dts
+++ b/trunk/arch/powerpc/boot/dts/tqm8541.dts
@@ -47,7 +47,7 @@
 		reg = <0x00000000 0x10000000>;
 	};
 
-	soc8541@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
diff --git a/trunk/arch/powerpc/boot/dts/tqm8555.dts b/trunk/arch/powerpc/boot/dts/tqm8555.dts
index eef9a6bb748b..a20eb06c482f 100644
--- a/trunk/arch/powerpc/boot/dts/tqm8555.dts
+++ b/trunk/arch/powerpc/boot/dts/tqm8555.dts
@@ -47,7 +47,7 @@
 		reg = <0x00000000 0x10000000>;
 	};
 
-	soc8555@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
diff --git a/trunk/arch/powerpc/boot/dts/tqm8560.dts b/trunk/arch/powerpc/boot/dts/tqm8560.dts
index 8ca7fdd0a129..b9ac6c943b89 100644
--- a/trunk/arch/powerpc/boot/dts/tqm8560.dts
+++ b/trunk/arch/powerpc/boot/dts/tqm8560.dts
@@ -48,7 +48,7 @@
 		reg = <0x00000000 0x10000000>;
 	};
 
-	soc8560@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
diff --git a/trunk/arch/powerpc/platforms/85xx/stx_gp3.c b/trunk/arch/powerpc/platforms/85xx/stx_gp3.c
index 0b20c170c4d2..18499d7c9d9e 100644
--- a/trunk/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/trunk/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -148,10 +148,6 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m)
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
-	{ .name = "soc", },
-	{ .type = "soc", },
-	{ .name = "cpm", },
-	{ .name = "localbus", },
 	{ .compatible = "simple-bus", },
 	{},
 };
diff --git a/trunk/arch/powerpc/platforms/85xx/tqm85xx.c b/trunk/arch/powerpc/platforms/85xx/tqm85xx.c
index 2a08b315e190..77681acf1bae 100644
--- a/trunk/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/trunk/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -146,10 +146,6 @@ static void tqm85xx_show_cpuinfo(struct seq_file *m)
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
-	{ .name = "soc", },
-	{ .type = "soc", },
-	{ .name = "cpm", },
-	{ .name = "localbus", },
 	{ .compatible = "simple-bus", },
 	{},
 };