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 also probably be rolled up into patch 4. Martyn > Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@xxxxxxxxxx> > --- > drivers/staging/ipack/devices/ipoctal.c | 3 +-- > drivers/staging/ipack/devices/ipoctal.h | 3 +-- > drivers/staging/ipack/devices/scc2698.h | 3 +-- > 3 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c > index 15c0c6b..a28c677 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 7c5d211..266f361 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 e683019..47f6269 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_ -- 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
