On Tue, 26 Jun 2012 16:29:08 +0200, Florian Fainelli <florian@xxxxxxxxxxx>
wrote:
On Monday 25 June 2012 23:41:20 Steven J. Hill wrote:
From: "Steven J. Hill" <sjhill@xxxxxxxx>
Make headers consistent across the files and make changes based on
running the checkpatch script.
Signed-off-by: Steven J. Hill <sjhill@xxxxxxxx>
---
arch/mips/ar7/memory.c | 18 ++++------------
arch/mips/ar7/platform.c | 53
++++++++++++++++++----------------------------
[snip]
*/
#include <linux/bootmem.h>
#include <linux/init.h>
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 284b86a..921e42c 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -1,22 +1,12 @@
/*
+ * This file is subject to the terms and conditions of the GNU General
Public
+ * License. See the file "COPYING" in the main directory of this
archive
+ * for more details.
+ *
* Copyright (C) 2006,2007 Felix Fietkau <nbd@xxxxxxxxxxx>
* Copyright (C) 2006,2007 Eugene Konev <ejka@xxxxxxxxxxx>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301
USA
+ * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved.
You are adding MTI's Copyright back here, which I assume is a left-over
from
your first submission.
I don't even see a reason to touch said headers. Specially because with
some files you are actually changing the license (in this case, GPLv2+ ->
GPLv2), which is leagally wrong. In other cases your change "only" removes
the GPL version number, which can cause issues if the file will be moved
out.
So in files under my copyright, NAK.
Imre
