Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 0 insertions, 3 deletions

diff --git a/arch/microblaze/platform/platform.c b/arch/microblaze/platform/platform.c
index 5b89b58c5aed..b9529caa507a 100644
--- a/arch/microblaze/platform/platform.c
+++ b/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", },
         {}
 };