summaryrefslogtreecommitdiffstats
path: root/drivers/staging/ipack
diff options
context:
space:
mode:
authorSamuel Iglesias Gonsalvez <siglesias@igalia.com>2012-05-11 10:17:14 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-14 13:41:29 -0700
commitb995069af54cf1cf0de19ff440a93e528ea993de (patch)
tree38a3fff510531005b3d72d7b97ced5f1cc0f99ee /drivers/staging/ipack
parent416289b14a8ab1a0fea7b7ee03724c4820578427 (diff)
downloadlinux-b995069af54cf1cf0de19ff440a93e528ea993de.tar.bz2
Staging: ipack/bridges/tpci200: 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>
Diffstat (limited to 'drivers/staging/ipack')
-rw-r--r--drivers/staging/ipack/bridges/tpci200.c3
-rw-r--r--drivers/staging/ipack/bridges/tpci200.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c
index 08cd85150ef2..80cdd9ec2ba6 100644
--- a/drivers/staging/ipack/bridges/tpci200.c
+++ b/drivers/staging/ipack/bridges/tpci200.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/bridges/tpci200.h b/drivers/staging/ipack/bridges/tpci200.h
index e452da2f17f7..75801f6cf68c 100644
--- a/drivers/staging/ipack/bridges/tpci200.h
+++ b/drivers/staging/ipack/bridges/tpci200.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 _TPCI200_H_