Merge commit '81fd23e2b3ccf71c807e671444e8accaba98ca53' of https://git.pengutronix...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / bcm911360_entphn.dts

diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts
index b2d323f..a76c74b 100644 (file)
--- a/arch/arm/boot/dts/bcm911360_entphn.dts
+++ b/arch/arm/boot/dts/bcm911360_entphn.dts
@@ -82,8 +82,8 @@
        status = "okay";
 };
 
-&nand {
-       nandcs@1 {
+&nand_controller {
+       nand@1 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-on-flash-bbt;