Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx23-evk.dts

diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts
index 0b2701ca29212c1d800a8ed04e0958c22507c54c..8cbaf1c8117456a11125de5f1f9986e1c9078e7d 100644 (file)
--- a/arch/arm/boot/dts/imx23-evk.dts
+++ b/arch/arm/boot/dts/imx23-evk.dts
@@ -53,7 +53,7 @@
 
        apb@80000000 {
                apbh@80000000 {
-                       gpmi-nand@8000c000 {
+                       nand-controller@8000c000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&gpmi_pins_a &gpmi_pins_fixup>;
                                status = "okay";