From 69453206e4563183f757f403f2bd2d0a1dcf437b Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 14 Sep 2010 08:09:37 +0200
Subject: [PATCH] --- yaml --- r: 217143 b: refs/heads/master c:
 e65f1e2843d31d9ed74c7cce273adc0d97b5140f h: refs/heads/master i:   217141:
 1b649962d1ed6e00fefc22243ff70ba30704823c   217139:
 84f60dabf9a6b27c4b19c63370f90bbc2ab9c631   217135:
 70085b373a08454515a704cad9ee1264d77d693b v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/microblaze/kernel/heartbeat.c  | 1 -
 trunk/arch/microblaze/kernel/intc.c       | 3 ---
 trunk/arch/microblaze/kernel/timer.c      | 2 --
 trunk/arch/microblaze/platform/platform.c | 3 ---
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5c080f2ebba8..82f5ff3679f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7d8355008e4f6bbdcb8f998328afa685cec959c
+refs/heads/master: e65f1e2843d31d9ed74c7cce273adc0d97b5140f
diff --git a/trunk/arch/microblaze/kernel/heartbeat.c b/trunk/arch/microblaze/kernel/heartbeat.c
index f8bc2d79ee35..5c24eb8219f1 100644
--- a/trunk/arch/microblaze/kernel/heartbeat.c
+++ b/trunk/arch/microblaze/kernel/heartbeat.c
@@ -49,7 +49,6 @@ void setup_heartbeat(void)
 	int j;
 	const char * const gpio_list[] = {
 		"xlnx,xps-gpio-1.00.a",
-		"xlnx,opb-gpio-1.00.a",
 		NULL
 	};
 
diff --git a/trunk/arch/microblaze/kernel/intc.c b/trunk/arch/microblaze/kernel/intc.c
index e1cf0819d753..e85bbea1c62b 100644
--- a/trunk/arch/microblaze/kernel/intc.c
+++ b/trunk/arch/microblaze/kernel/intc.c
@@ -128,9 +128,6 @@ void __init init_IRQ(void)
 #endif
 	const char * const intc_list[] = {
 				"xlnx,xps-intc-1.00.a",
-				"xlnx,opb-intc-1.00.c",
-				"xlnx,opb-intc-1.00.b",
-				"xlnx,opb-intc-1.00.a",
 				NULL
 			};
 
diff --git a/trunk/arch/microblaze/kernel/timer.c b/trunk/arch/microblaze/kernel/timer.c
index da9d1e56108b..64ca14dbac6e 100644
--- a/trunk/arch/microblaze/kernel/timer.c
+++ b/trunk/arch/microblaze/kernel/timer.c
@@ -260,8 +260,6 @@ void __init time_init(void)
 #endif
 	const char * const timer_list[] = {
 		"xlnx,xps-timer-1.00.a",
-		"xlnx,opb-timer-1.00.b",
-		"xlnx,opb-timer-1.00.a",
 		NULL
 	};
 
diff --git a/trunk/arch/microblaze/platform/platform.c b/trunk/arch/microblaze/platform/platform.c
index 5b89b58c5aed..b9529caa507a 100644
--- a/trunk/arch/microblaze/platform/platform.c
+++ b/trunk/arch/microblaze/platform/platform.c
@@ -17,9 +17,6 @@
 
 static struct of_device_id xilinx_of_bus_ids[] __initdata = {
 	{ .compatible = "simple-bus", },
-	{ .compatible = "xlnx,plb-v46-1.00.a", },
-	{ .compatible = "xlnx,opb-v20-1.10.c", },
-	{ .compatible = "xlnx,opb-v20-1.10.b", },
 	{ .compatible = "xlnx,compound", },
 	{}
 };