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

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

diff --git a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
index 3b1baa8..2214bfe 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
@@ -92,13 +92,13 @@
                                                        reg = <0x40000 0xc0000>;
                                                };
 
-                                               bootloaderenv@0x100000 {
-                                                       label = "bootloader env";
+                                               bootloaderenvred@0x100000 {
+                                                       label = "bootloader env redundant";
                                                        reg = <0x100000 0x40000>;
                                                };
 
-                                               bootloaderenvred@0x140000 {
-                                                       label = "bootloader env redundant";
+                                               bootloaderenv@0x140000 {
+                                                       label = "bootloader env";
                                                        reg = <0x140000 0x40000>;
                                                };