summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Iglesias Gonsalvez2012-05-11 10:17:15 +0200
committerGreg Kroah-Hartman2012-05-14 22:41:29 +0200
commit32254363c2bb1a5384e8919ea706cf0355ecc2eb (patch)
tree6223316b7d51c0ba44e37aa1e633ab7d11e87b8a
parentStaging: ipack/bridges/tpci200: change the licence to explicitly GPLv2 (diff)
downloadkernel-qcow2-linux-32254363c2bb1a5384e8919ea706cf0355ecc2eb.tar.gz
kernel-qcow2-linux-32254363c2bb1a5384e8919ea706cf0355ecc2eb.tar.xz
kernel-qcow2-linux-32254363c2bb1a5384e8919ea706cf0355ecc2eb.zip
Staging: ipack/devices/ipoctal: change the licence to explicitly GPLv2
Change the licence to explicitly GPLv2 to avoid possible conflicts in the future. Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/ipack/devices/ipoctal.c3
-rw-r--r--drivers/staging/ipack/devices/ipoctal.h3
-rw-r--r--drivers/staging/ipack/devices/scc2698.h3
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c
index 15c0c6b53ce0..a28c677cbad1 100644
--- a/drivers/staging/ipack/devices/ipoctal.c
+++ b/drivers/staging/ipack/devices/ipoctal.c
@@ -8,8 +8,7 @@
*
* 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.
+ * Software Foundation; version 2 of the License.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/ipack/devices/ipoctal.h b/drivers/staging/ipack/devices/ipoctal.h
index 7c5d211de73d..266f3617069d 100644
--- a/drivers/staging/ipack/devices/ipoctal.h
+++ b/drivers/staging/ipack/devices/ipoctal.h
@@ -8,8 +8,7 @@
*
* 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.
+ * Software Foundation; version 2 of the License.
*/
#ifndef _IPOCTAL_H
diff --git a/drivers/staging/ipack/devices/scc2698.h b/drivers/staging/ipack/devices/scc2698.h
index e68301900cfa..47f6269985fd 100644
--- a/drivers/staging/ipack/devices/scc2698.h
+++ b/drivers/staging/ipack/devices/scc2698.h
@@ -8,8 +8,7 @@
*
* 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.
+ * Software Foundation; version 2 of the License.
*/
#ifndef SCC2698_H_