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