diff --git a/[refs] b/[refs]
index 58ddcddcd452..46001ea29bd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26738ddb8553f0883c949310337abcf5b353f63d
+refs/heads/master: c80e572c029263687b8175f1ba71d425548cafcf
diff --git a/trunk/Documentation/devicetree/bindings/mtd/elm.txt b/trunk/Documentation/devicetree/bindings/mtd/elm.txt
index e43c668656bc..8c1528c421d4 100644
--- a/trunk/Documentation/devicetree/bindings/mtd/elm.txt
+++ b/trunk/Documentation/devicetree/bindings/mtd/elm.txt
@@ -10,7 +10,7 @@ Optional properties:
 
 Example:
 elm: elm@0 {
-	compatible	= "ti,am33xx-elm";
+	compatible = "ti,am3352-elm";
 	reg = <0x48080000 0x2000>;
 	interrupts = <4>;
 };
diff --git a/trunk/drivers/mtd/devices/elm.c b/trunk/drivers/mtd/devices/elm.c
index b93a349ae587..2ec5da9ee248 100644
--- a/trunk/drivers/mtd/devices/elm.c
+++ b/trunk/drivers/mtd/devices/elm.c
@@ -380,7 +380,7 @@ static int elm_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id elm_of_match[] = {
-	{ .compatible = "ti,am33xx-elm" },
+	{ .compatible = "ti,am3352-elm" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, elm_of_match);