Merge branch 'parisc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / armada-xp-synology-ds414.dts

diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
index e803da03146a648654d1a51408b1c4f71db595a8..d7228a5461c828d495546f939cd9fddfd6356dbd 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
@@ -13,17 +13,17 @@
  *     published by the Free Software Foundation; either version 2 of the
  *     License, or (at your option) any later version.
  *
- *     This file is distributed in the hope that it will be useful
+ *     This file is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
  *
- * Or, alternatively
+ * Or, alternatively,
  *
  *  b) Permission is hereby granted, free of charge, to any person
  *     obtaining a copy of this software and associated documentation
  *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
+ *     restriction, including without limitation the rights to use,
  *     copy, modify, merge, publish, distribute, sublicense, and/or
  *     sell copies of the Software, and to permit persons to whom the
  *     Software is furnished to do so, subject to the following
@@ -32,11 +32,11 @@
  *     The above copyright notice and this permission notice shall be
  *     included in all copies or substantial portions of the Software.
  *
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *     OTHER DEALINGS IN THE SOFTWARE.
@@ -332,32 +332,32 @@
                 * change the default environment, unless you know
                 * what you are doing.
                 */
-               partition@00000000 { /* u-boot */
+               partition@0 { /* u-boot */
                        label = "RedBoot";
                        reg = <0x00000000 0x000d0000>; /* 832KB */
                };
 
-               partition@000c0000 { /* uImage */
+               partition@c0000 { /* uImage */
                        label = "zImage";
                        reg = <0x000d0000 0x002d0000>; /* 2880KB */
                };
 
-               partition@003a0000 { /* uInitramfs */
+               partition@3a0000 { /* uInitramfs */
                        label = "rd.gz";
                        reg = <0x003a0000 0x00430000>; /* 4250KB */
                };
 
-               partition@007d0000 { /* MAC address and serial number */
+               partition@7d0000 { /* MAC address and serial number */
                        label = "vendor";
                        reg = <0x007d0000 0x00010000>; /* 64KB */
                };
 
-               partition@007e0000 {
+               partition@7e0000 {
                        label = "RedBoot config";
                        reg = <0x007e0000 0x00010000>; /* 64KB */
                };
 
-               partition@007f0000 {
+               partition@7f0000 {
                        label = "FIS directory";
                        reg = <0x007f0000 0x00010000>; /* 64KB */
                };