From f88c9540166a6528ee00f3c130ba8812977d95cb Mon Sep 17 00:00:00 2001
From: Jason Cooper <jason@lakedaemon.net>
Date: Wed, 7 Mar 2012 15:03:57 +0000
Subject: [PATCH] --- yaml --- r: 296719 b: refs/heads/master c:
 b77816dea3e4c0f815510dea2a0ca9bcda6644dc h: refs/heads/master i:   296717:
 d32d25b1f4de0740f1af279dff348693a51482b2   296715:
 120b8a2ea374ab429fe1f2ef45ab44d91f847336   296711:
 0527e7f68d23422067f7e1ab484e3f17b08cadb7   296703:
 8b30f811fa69766753b2fdf34d35d3b672678d33 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts | 4 ++--
 trunk/arch/arm/boot/dts/kirkwood.dtsi          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3322f9b73815..9361226dfdab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a855a7ced4f572dcd1038db06b532df3ba9f227c
+refs/heads/master: b77816dea3e4c0f815510dea2a0ca9bcda6644dc
diff --git a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts b/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 8a5dff807b45..333f11b85504 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -4,7 +4,7 @@
 
 / {
 	model = "Globalscale Technologies Dreamplug";
-	compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+	compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
 
 	memory {
 		device_type = "memory";
@@ -17,7 +17,7 @@
 
 	serial@f1012000 {
 		compatible = "ns16550a";
-		reg = <0xf1012000 0xff>;
+		reg = <0xf1012000 0x100>;
 		reg-shift = <2>;
 		interrupts = <33>;
 		clock-frequency = <200000000>;
diff --git a/trunk/arch/arm/boot/dts/kirkwood.dtsi b/trunk/arch/arm/boot/dts/kirkwood.dtsi
index 771c6bbeb29a..702b9555d019 100644
--- a/trunk/arch/arm/boot/dts/kirkwood.dtsi
+++ b/trunk/arch/arm/boot/dts/kirkwood.dtsi
@@ -1,6 +1,6 @@
 /include/ "skeleton.dtsi"
 
 / {
-	compatible = "marvell,kirkwood";
+	compatible = "mrvl,kirkwood";
 };