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

Conflicts:
	litmus/sched_cedf.c

3 files changed, 4 insertions, 4 deletions

diff --git a/arch/microblaze/platform/generic/Kconfig.auto b/arch/microblaze/platform/generic/Kconfig.auto
index 5d86fc19029d..25a6f019e94d 100644
--- a/arch/microblaze/platform/generic/Kconfig.auto
+++ b/arch/microblaze/platform/generic/Kconfig.auto
@@ -29,7 +29,7 @@ config KERNEL_BASE_ADDR
           BASE Address for kernel
 
 config XILINX_MICROBLAZE0_FAMILY
-        string "Targetted FPGA family"
+        string "Targeted FPGA family"
         default "virtex5"
 
 config XILINX_MICROBLAZE0_USE_MSR_INSTR
diff --git a/arch/microblaze/platform/generic/system.dts b/arch/microblaze/platform/generic/system.dts
index 2d5c41767cd0..3f85df2b73b3 100644
--- a/arch/microblaze/platform/generic/system.dts
+++ b/arch/microblaze/platform/generic/system.dts
@@ -85,6 +85,7 @@
                         xlnx,dynamic-bus-sizing = <0x1>;
                         xlnx,edge-is-positive = <0x1>;
                         xlnx,family = "virtex5";
+                        xlnx,endianness = <0x1>;
                         xlnx,fpu-exception = <0x1>;
                         xlnx,fsl-data-size = <0x20>;
                         xlnx,fsl-exception = <0x0>;
@@ -218,6 +219,7 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         compatible = "xlnx,compound";
+                        ranges ;
                         ethernet@81c00000 {
                                 compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
                                 device_type = "network";
@@ -332,6 +334,7 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         compatible = "xlnx,mpmc-4.02.a";
+                        ranges ;
                         PIM3: sdma@84600180 {
                                 compatible = "xlnx,ll-dma-1.00.a";
                                 interrupt-parent = <&xps_intc_0>;
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", },
         {}
 };