diff --git a/[refs] b/[refs] index bc42d18f2e32..4776f8a0369d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a8e5149efd4e20e329beec47e3bb57ce2c5938a +refs/heads/master: a217c46c2ed65d4cde5c7c72290deebc2303116e diff --git a/trunk/arch/arm/boot/dts/imx23.dtsi b/trunk/arch/arm/boot/dts/imx23.dtsi index 8c5f9994f3fc..0af43c007287 100644 --- a/trunk/arch/arm/boot/dts/imx23.dtsi +++ b/trunk/arch/arm/boot/dts/imx23.dtsi @@ -62,7 +62,7 @@ status = "disabled"; }; - gpmi@8000c000 { + gpmi-nand@8000c000 { reg = <0x8000c000 2000>; status = "disabled"; };