diff options
author | Sri Krishna chowdary <schowdary@nvidia.com> | 2014-04-23 11:09:25 +0530 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2014-05-13 14:37:29 -0700 |
commit | 71bea628c2ce8dfe9fcf54e1eeb7dc84242c2314 (patch) | |
tree | 91673d2c999aebb883cd4c722c7886cc0f09cb25 | |
parent | 1dcea1883606e34417bdcc30d8678988359c5907 (diff) |
staging: iio: light: update copyright to GPLv2
Bug 1495051
Change-Id: I2bf7838dc79848017bf38affe6d61e4349fb3d49
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/400089
(cherry picked from commit 4a556c1bf36e12034f653dc129084954c98a896b)
Reviewed-on: http://git-master/r/404970
(cherry picked from commit 050e92969edd6cd0e28542598a36eb1c50441edc)
Reviewed-on: http://git-master/r/408090
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r-- | drivers/staging/iio/light/cm3217.c | 14 | ||||
-rw-r--r-- | drivers/staging/iio/light/cm3218.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/light/iqs253.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/light/isl29018.c | 15 | ||||
-rw-r--r-- | drivers/staging/iio/light/isl29028.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/light/jsa1127.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/light/ls_dt.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/light/ls_sysfs.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/light/ltr558als.c | 12 | ||||
-rw-r--r-- | drivers/staging/iio/light/ltr558als.h | 12 | ||||
-rw-r--r-- | drivers/staging/iio/light/max44005.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/light/stm8t143.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/light/tcs3772.c | 3 | ||||
-rw-r--r-- | include/linux/iio/light/jsa1127.h | 3 | ||||
-rw-r--r-- | include/linux/iio/light/ls_dt.h | 3 | ||||
-rw-r--r-- | include/linux/iio/light/ls_sysfs.h | 3 |
16 files changed, 28 insertions, 61 deletions
diff --git a/drivers/staging/iio/light/cm3217.c b/drivers/staging/iio/light/cm3217.c index 0e36399f4c9e..e5cc8e7f7223 100644 --- a/drivers/staging/iio/light/cm3217.c +++ b/drivers/staging/iio/light/cm3217.c @@ -1,13 +1,13 @@ /* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. * - * 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. + * This program is distributed in the hope 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. */ #include <linux/i2c.h> diff --git a/drivers/staging/iio/light/cm3218.c b/drivers/staging/iio/light/cm3218.c index 4114779c2157..3a0b906e8939 100644 --- a/drivers/staging/iio/light/cm3218.c +++ b/drivers/staging/iio/light/cm3218.c @@ -14,9 +14,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/module.h> diff --git a/drivers/staging/iio/light/iqs253.c b/drivers/staging/iio/light/iqs253.c index f1c2fac15e10..035d3fe79d9a 100644 --- a/drivers/staging/iio/light/iqs253.c +++ b/drivers/staging/iio/light/iqs253.c @@ -13,9 +13,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/module.h> diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c index 82478a59e42e..946175ec190c 100644 --- a/drivers/staging/iio/light/isl29018.c +++ b/drivers/staging/iio/light/isl29018.c @@ -4,21 +4,16 @@ * IIO driver for monitoring ambient light intensity in luxi, proximity * sensing and infrared sensing. * - * Copyright (c) 2010, NVIDIA Corporation. + * Copyright (c) 2010, NVIDIA CORPORATION. All rights reserved. * - * 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 free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, but WITHOUT + * This program is distributed in the hope 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <linux/module.h> diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c index 2bc3caf1de4b..ff8c25443689 100644 --- a/drivers/staging/iio/light/isl29028.c +++ b/drivers/staging/iio/light/isl29028.c @@ -12,9 +12,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/module.h> diff --git a/drivers/staging/iio/light/jsa1127.c b/drivers/staging/iio/light/jsa1127.c index 64480be4f5c6..a8678ea5ed30 100644 --- a/drivers/staging/iio/light/jsa1127.c +++ b/drivers/staging/iio/light/jsa1127.c @@ -14,9 +14,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/module.h> diff --git a/drivers/staging/iio/light/ls_dt.c b/drivers/staging/iio/light/ls_dt.c index bd800b996d7d..1d95a38455dc 100644 --- a/drivers/staging/iio/light/ls_dt.c +++ b/drivers/staging/iio/light/ls_dt.c @@ -9,9 +9,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/module.h> diff --git a/drivers/staging/iio/light/ls_sysfs.c b/drivers/staging/iio/light/ls_sysfs.c index e36d02ab3a64..0bab6dad2702 100644 --- a/drivers/staging/iio/light/ls_sysfs.c +++ b/drivers/staging/iio/light/ls_sysfs.c @@ -9,9 +9,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/module.h> diff --git a/drivers/staging/iio/light/ltr558als.c b/drivers/staging/iio/light/ltr558als.c index 3010b3db2b95..f5146123f284 100644 --- a/drivers/staging/iio/light/ltr558als.c +++ b/drivers/staging/iio/light/ltr558als.c @@ -2,10 +2,14 @@ * * Copyright (c) 2012-2014, NVIDIA CORPORATION. All rights reserved. * - * 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 free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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. */ #include <linux/delay.h> diff --git a/drivers/staging/iio/light/ltr558als.h b/drivers/staging/iio/light/ltr558als.h index 64617728adc2..eb948dc163ac 100644 --- a/drivers/staging/iio/light/ltr558als.h +++ b/drivers/staging/iio/light/ltr558als.h @@ -2,10 +2,14 @@ * * Copyright (c) 2012-2014, NVIDIA Corporation. All Rights reserved. * - * 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 free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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. */ #ifndef _LTR558_H diff --git a/drivers/staging/iio/light/max44005.c b/drivers/staging/iio/light/max44005.c index 91fff947f90c..de11f26c1607 100644 --- a/drivers/staging/iio/light/max44005.c +++ b/drivers/staging/iio/light/max44005.c @@ -14,9 +14,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/module.h> diff --git a/drivers/staging/iio/light/stm8t143.c b/drivers/staging/iio/light/stm8t143.c index 4044ac86c255..b144cdee2a8d 100644 --- a/drivers/staging/iio/light/stm8t143.c +++ b/drivers/staging/iio/light/stm8t143.c @@ -13,9 +13,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/module.h> diff --git a/drivers/staging/iio/light/tcs3772.c b/drivers/staging/iio/light/tcs3772.c index 9148584c7261..f71aba45a67b 100644 --- a/drivers/staging/iio/light/tcs3772.c +++ b/drivers/staging/iio/light/tcs3772.c @@ -14,9 +14,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/module.h> diff --git a/include/linux/iio/light/jsa1127.h b/include/linux/iio/light/jsa1127.h index 377d6429ea79..0ddae9d9902d 100644 --- a/include/linux/iio/light/jsa1127.h +++ b/include/linux/iio/light/jsa1127.h @@ -14,9 +14,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #define JSA1127_NAME "jsa1127" diff --git a/include/linux/iio/light/ls_dt.h b/include/linux/iio/light/ls_dt.h index 20c4788bd742..19f5c704bd0a 100644 --- a/include/linux/iio/light/ls_dt.h +++ b/include/linux/iio/light/ls_dt.h @@ -9,9 +9,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #ifndef __IIO_LS_DT_H__ diff --git a/include/linux/iio/light/ls_sysfs.h b/include/linux/iio/light/ls_sysfs.h index 909c7624d8bc..a72b13acb290 100644 --- a/include/linux/iio/light/ls_sysfs.h +++ b/include/linux/iio/light/ls_sysfs.h @@ -9,9 +9,6 @@ * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/iio/iio.h> |