From 9fb79214404a0cc12d6913ec60b6bdc1ce505e03 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 9 Jun 2012 01:21:55 +0200 Subject: [PATCH] --- yaml --- r: 313223 b: refs/heads/master c: a217c46c2ed65d4cde5c7c72290deebc2303116e h: refs/heads/master i: 313221: efed8e9d0f7496a29004894f32d51fd120a6ec44 313219: 183e25710d9e1c0597582c2b9c48a47203c04249 313215: a012f3e0069b36a96cd7d8d21311052a5f3ce9bd v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx23.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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"; };