On 11/05/12 09:17, Samuel Iglesias Gonsalvez wrote: > Change the licence to explicitly GPLv2 to avoid possible conflicts in the > future. > This could probably be rolled up into patch 4. Martyn > Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@xxxxxxxxxx> > --- > drivers/staging/ipack/bridges/tpci200.c | 3 +-- > drivers/staging/ipack/bridges/tpci200.h | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c > index 08cd851..80cdd9e 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 e452da2..75801f6 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_ -- Martyn Welch (Lead Software Engineer) | Registered in England and Wales GE Intelligent Platforms | (3828642) at 100 Barbirolli Square T +44(0)1327322748 | Manchester, M2 3AB E martyn.welch@xxxxxx | VAT:GB 927559189 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
