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

[linux-2.6-microblaze.git] / arch / arm / boot / dts / bcm47094-dlink-dir-885l.dts

diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
index e635a15..a6e2aeb 100644 (file)
--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
@@ -25,8 +25,8 @@
                      <0x88000000 0x08000000>;
        };
 
-       nand: nand@18028000 {
-               nandcs@0 {
+       nand_controller: nand-controller@18028000 {
+               nand@0 {
                        partitions {
                                compatible = "fixed-partitions";
                                #address-cells = <1>;