From 0666a8b8032bad8fa07859bfc38ac9fee97eaf8e Mon Sep 17 00:00:00 2001 From: "hdoyu@nvidia.com" Date: Wed, 16 May 2012 19:47:47 +0000 Subject: [PATCH] --- yaml --- r: 313086 b: refs/heads/master c: 4c5ddd952ef1e534b45218cf4ad74b5496e6406c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/devicetree/bindings/arm/tegra/emc.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c31a757a5ae..3d4420274f3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfb3fe12667244d2c51699608a1591f1fdb774e5 +refs/heads/master: 4c5ddd952ef1e534b45218cf4ad74b5496e6406c diff --git a/trunk/Documentation/devicetree/bindings/arm/tegra/emc.txt b/trunk/Documentation/devicetree/bindings/arm/tegra/emc.txt index 09335f8eee00..4c33b29dc660 100644 --- a/trunk/Documentation/devicetree/bindings/arm/tegra/emc.txt +++ b/trunk/Documentation/devicetree/bindings/arm/tegra/emc.txt @@ -15,7 +15,7 @@ Child device nodes describe the memory settings for different configurations and Example: - emc@7000f400 { + memory-controller@7000f400 { #address-cells = < 1 >; #size-cells = < 0 >; compatible = "nvidia,tegra20-emc";