Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / arm / boot / dts / omap36xx.dtsi

diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 3502fe0..86253de 100644 (file)
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -78,7 +78,7 @@
                               0x480bd800 0x0600>;
                        interrupts = <24>;
                        iommus = <&mmu_isp>;
-                       syscon = <&omap3_scm_general 0x2f0>;
+                       syscon = <&scm_conf 0x2f0>;
                        ti,phy-type = <OMAP3ISP_PHY_TYPE_CSIPHY>;
                        #clock-cells = <1>;
                        ports {