From 33a16b44fae1bdd65d7dcc7d8af31beb3fea4e75 Mon Sep 17 00:00:00 2001
From: Hiroshi Doyu <hdoyu@nvidia.com>
Date: Tue, 29 Jan 2013 10:30:29 +0200
Subject: [PATCH] --- yaml --- r: 355771 b: refs/heads/master c:
 3fbf07d80b40f73c304624179381f9038bd03b74 h: refs/heads/master i:   355769:
 07fb08c666ccc3ac7a3995a96ca67bec2e15f30b   355767:
 bf90008f44b3236083faf82b1f0b123cca230cc6 v: v3

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

diff --git a/[refs] b/[refs]
index 0890645b3c6f..56ff940977e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 109269e87895caaa927bc313bc2a2cad8a114b08
+refs/heads/master: 3fbf07d80b40f73c304624179381f9038bd03b74
diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi
index 313fa71e099d..572a45bab93b 100644
--- a/trunk/arch/arm/boot/dts/tegra30.dtsi
+++ b/trunk/arch/arm/boot/dts/tegra30.dtsi
@@ -440,7 +440,7 @@
 		interrupts = <0 77 0x04>;
 	};
 
-	smmu {
+	iommu {
 		compatible = "nvidia,tegra30-smmu";
 		reg = <0x7000f010 0x02c
 		       0x7000f1f0 0x010