diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2016-12-27 16:36:50 -0500 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2017-01-03 10:24:34 -0500 |
| commit | 58a748f7dc29d8a7bb74c6cbba6a82425dbba5cc (patch) | |
| tree | 49a8fed5e338c8007aaad7c0bb3d2eb726a9435a | |
| parent | c7d7ea67d32f7bbd2fa83c3e041973d0e8680080 (diff) | |
ARM64: dts: marvell: Correct license text
The license text has been mangled at some point then copy pasted across
multiple files. Restore it to what it should be.
Note that this is not intended as a license change.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-371x.dtsi | 10 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-3720-db.dts | 10 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 10 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-372x.dtsi | 10 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 10 |
5 files changed, 25 insertions, 25 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-371x.dtsi b/arch/arm64/boot/dts/marvell/armada-371x.dtsi index c9e5325b8ac3..11226f7b9ed9 100644 --- a/arch/arm64/boot/dts/marvell/armada-371x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-371x.dtsi | |||
| @@ -16,17 +16,17 @@ | |||
| 16 | * published by the Free Software Foundation; either version 2 of the | 16 | * published by the Free Software Foundation; either version 2 of the |
| 17 | * License, or (at your option) any later version. | 17 | * License, or (at your option) any later version. |
| 18 | * | 18 | * |
| 19 | * This file is distributed in the hope that it will be useful | 19 | * This file is distributed in the hope that it will be useful, |
| 20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 22 | * GNU General Public License for more details. | 22 | * GNU General Public License for more details. |
| 23 | * | 23 | * |
| 24 | * Or, alternatively | 24 | * Or, alternatively, |
| 25 | * | 25 | * |
| 26 | * b) Permission is hereby granted, free of charge, to any person | 26 | * b) Permission is hereby granted, free of charge, to any person |
| 27 | * obtaining a copy of this software and associated documentation | 27 | * obtaining a copy of this software and associated documentation |
| 28 | * files (the "Software"), to deal in the Software without | 28 | * files (the "Software"), to deal in the Software without |
| 29 | * restriction, including without limitation the rights to use | 29 | * restriction, including without limitation the rights to use, |
| 30 | * copy, modify, merge, publish, distribute, sublicense, and/or | 30 | * copy, modify, merge, publish, distribute, sublicense, and/or |
| 31 | * sell copies of the Software, and to permit persons to whom the | 31 | * sell copies of the Software, and to permit persons to whom the |
| 32 | * Software is furnished to do so, subject to the following | 32 | * Software is furnished to do so, subject to the following |
| @@ -35,11 +35,11 @@ | |||
| 35 | * The above copyright notice and this permission notice shall be | 35 | * The above copyright notice and this permission notice shall be |
| 36 | * included in all copies or substantial portions of the Software. | 36 | * included in all copies or substantial portions of the Software. |
| 37 | * | 37 | * |
| 38 | * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND | 38 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
| 39 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | 39 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
| 40 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 40 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
| 41 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | 41 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
| 42 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY | 42 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
| 43 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | 43 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 44 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | 44 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
| 45 | * OTHER DEALINGS IN THE SOFTWARE. | 45 | * OTHER DEALINGS IN THE SOFTWARE. |
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts index 935d37f82ce8..86602c907a61 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts | |||
| @@ -15,17 +15,17 @@ | |||
| 15 | * published by the Free Software Foundation; either version 2 of the | 15 | * published by the Free Software Foundation; either version 2 of the |
| 16 | * License, or (at your option) any later version. | 16 | * License, or (at your option) any later version. |
| 17 | * | 17 | * |
| 18 | * This file is distributed in the hope that it will be useful | 18 | * This file is distributed in the hope that it will be useful, |
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 21 | * GNU General Public License for more details. | 21 | * GNU General Public License for more details. |
| 22 | * | 22 | * |
| 23 | * Or, alternatively | 23 | * Or, alternatively, |
| 24 | * | 24 | * |
| 25 | * b) Permission is hereby granted, free of charge, to any person | 25 | * b) Permission is hereby granted, free of charge, to any person |
| 26 | * obtaining a copy of this software and associated documentation | 26 | * obtaining a copy of this software and associated documentation |
| 27 | * files (the "Software"), to deal in the Software without | 27 | * files (the "Software"), to deal in the Software without |
| 28 | * restriction, including without limitation the rights to use | 28 | * restriction, including without limitation the rights to use, |
| 29 | * copy, modify, merge, publish, distribute, sublicense, and/or | 29 | * copy, modify, merge, publish, distribute, sublicense, and/or |
| 30 | * sell copies of the Software, and to permit persons to whom the | 30 | * sell copies of the Software, and to permit persons to whom the |
| 31 | * Software is furnished to do so, subject to the following | 31 | * Software is furnished to do so, subject to the following |
| @@ -34,11 +34,11 @@ | |||
| 34 | * The above copyright notice and this permission notice shall be | 34 | * The above copyright notice and this permission notice shall be |
| 35 | * included in all copies or substantial portions of the Software. | 35 | * included in all copies or substantial portions of the Software. |
| 36 | * | 36 | * |
| 37 | * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND | 37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
| 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
| 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
| 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
| 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY | 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
| 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
| 44 | * OTHER DEALINGS IN THE SOFTWARE. | 44 | * OTHER DEALINGS IN THE SOFTWARE. |
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts index 12d9f6525d33..e3a136ed77b0 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | |||
| @@ -14,17 +14,17 @@ | |||
| 14 | * published by the Free Software Foundation; either version 2 of the | 14 | * published by the Free Software Foundation; either version 2 of the |
| 15 | * License, or (at your option) any later version. | 15 | * License, or (at your option) any later version. |
| 16 | * | 16 | * |
| 17 | * This file is distributed in the hope that it will be useful | 17 | * This file is distributed in the hope that it will be useful, |
| 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 20 | * GNU General Public License for more details. | 20 | * GNU General Public License for more details. |
| 21 | * | 21 | * |
| 22 | * Or, alternatively | 22 | * Or, alternatively, |
| 23 | * | 23 | * |
| 24 | * b) Permission is hereby granted, free of charge, to any person | 24 | * b) Permission is hereby granted, free of charge, to any person |
| 25 | * obtaining a copy of this software and associated documentation | 25 | * obtaining a copy of this software and associated documentation |
| 26 | * files (the "Software"), to deal in the Software without | 26 | * files (the "Software"), to deal in the Software without |
| 27 | * restriction, including without limitation the rights to use | 27 | * restriction, including without limitation the rights to use, |
| 28 | * copy, modify, merge, publish, distribute, sublicense, and/or | 28 | * copy, modify, merge, publish, distribute, sublicense, and/or |
| 29 | * sell copies of the Software, and to permit persons to whom the | 29 | * sell copies of the Software, and to permit persons to whom the |
| 30 | * Software is furnished to do so, subject to the following | 30 | * Software is furnished to do so, subject to the following |
| @@ -33,11 +33,11 @@ | |||
| 33 | * The above copyright notice and this permission notice shall be | 33 | * The above copyright notice and this permission notice shall be |
| 34 | * included in all copies or substantial portions of the Software. | 34 | * included in all copies or substantial portions of the Software. |
| 35 | * | 35 | * |
| 36 | * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND | 36 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
| 37 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | 37 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
| 38 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 38 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
| 39 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | 39 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
| 40 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY | 40 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
| 41 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | 41 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 42 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | 42 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
| 43 | * OTHER DEALINGS IN THE SOFTWARE. | 43 | * OTHER DEALINGS IN THE SOFTWARE. |
diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi index 5120296596c2..59d7557d3b1b 100644 --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi | |||
| @@ -16,17 +16,17 @@ | |||
| 16 | * published by the Free Software Foundation; either version 2 of the | 16 | * published by the Free Software Foundation; either version 2 of the |
| 17 | * License, or (at your option) any later version. | 17 | * License, or (at your option) any later version. |
| 18 | * | 18 | * |
| 19 | * This file is distributed in the hope that it will be useful | 19 | * This file is distributed in the hope that it will be useful, |
| 20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 22 | * GNU General Public License for more details. | 22 | * GNU General Public License for more details. |
| 23 | * | 23 | * |
| 24 | * Or, alternatively | 24 | * Or, alternatively, |
| 25 | * | 25 | * |
| 26 | * b) Permission is hereby granted, free of charge, to any person | 26 | * b) Permission is hereby granted, free of charge, to any person |
| 27 | * obtaining a copy of this software and associated documentation | 27 | * obtaining a copy of this software and associated documentation |
| 28 | * files (the "Software"), to deal in the Software without | 28 | * files (the "Software"), to deal in the Software without |
| 29 | * restriction, including without limitation the rights to use | 29 | * restriction, including without limitation the rights to use, |
| 30 | * copy, modify, merge, publish, distribute, sublicense, and/or | 30 | * copy, modify, merge, publish, distribute, sublicense, and/or |
| 31 | * sell copies of the Software, and to permit persons to whom the | 31 | * sell copies of the Software, and to permit persons to whom the |
| 32 | * Software is furnished to do so, subject to the following | 32 | * Software is furnished to do so, subject to the following |
| @@ -35,11 +35,11 @@ | |||
| 35 | * The above copyright notice and this permission notice shall be | 35 | * The above copyright notice and this permission notice shall be |
| 36 | * included in all copies or substantial portions of the Software. | 36 | * included in all copies or substantial portions of the Software. |
| 37 | * | 37 | * |
| 38 | * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND | 38 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
| 39 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | 39 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
| 40 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 40 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
| 41 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | 41 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
| 42 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY | 42 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
| 43 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | 43 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 44 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | 44 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
| 45 | * OTHER DEALINGS IN THE SOFTWARE. | 45 | * OTHER DEALINGS IN THE SOFTWARE. |
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index 926a4024c3dd..b48d668a6ab6 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi | |||
| @@ -15,17 +15,17 @@ | |||
| 15 | * published by the Free Software Foundation; either version 2 of the | 15 | * published by the Free Software Foundation; either version 2 of the |
| 16 | * License, or (at your option) any later version. | 16 | * License, or (at your option) any later version. |
| 17 | * | 17 | * |
| 18 | * This file is distributed in the hope that it will be useful | 18 | * This file is distributed in the hope that it will be useful, |
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 21 | * GNU General Public License for more details. | 21 | * GNU General Public License for more details. |
| 22 | * | 22 | * |
| 23 | * Or, alternatively | 23 | * Or, alternatively, |
| 24 | * | 24 | * |
| 25 | * b) Permission is hereby granted, free of charge, to any person | 25 | * b) Permission is hereby granted, free of charge, to any person |
| 26 | * obtaining a copy of this software and associated documentation | 26 | * obtaining a copy of this software and associated documentation |
| 27 | * files (the "Software"), to deal in the Software without | 27 | * files (the "Software"), to deal in the Software without |
| 28 | * restriction, including without limitation the rights to use | 28 | * restriction, including without limitation the rights to use, |
| 29 | * copy, modify, merge, publish, distribute, sublicense, and/or | 29 | * copy, modify, merge, publish, distribute, sublicense, and/or |
| 30 | * sell copies of the Software, and to permit persons to whom the | 30 | * sell copies of the Software, and to permit persons to whom the |
| 31 | * Software is furnished to do so, subject to the following | 31 | * Software is furnished to do so, subject to the following |
| @@ -34,11 +34,11 @@ | |||
| 34 | * The above copyright notice and this permission notice shall be | 34 | * The above copyright notice and this permission notice shall be |
| 35 | * included in all copies or substantial portions of the Software. | 35 | * included in all copies or substantial portions of the Software. |
| 36 | * | 36 | * |
| 37 | * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND | 37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
| 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
| 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
| 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
| 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY | 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
| 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
| 44 | * OTHER DEALINGS IN THE SOFTWARE. | 44 | * OTHER DEALINGS IN THE SOFTWARE. |