From 7d92be2f9482ec35f8b42120e039825b7938a446 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 29 Jan 2008 08:23:40 +0000 Subject: license cleanup SVN-Revision: 10305 --- .../linux/adm5120/files/drivers/ata/pata_rb153_cf.c | 10 +++++----- .../linux/adm5120/files/drivers/leds/leds-adm5120.c | 19 ++++--------------- .../files/drivers/leds/ledtrig-adm5120-switch.c | 2 +- .../adm5120/files/drivers/mtd/maps/adm5120-flash.c | 19 ++++--------------- target/linux/adm5120/files/drivers/mtd/myloader.c | 18 ++++-------------- target/linux/adm5120/files/drivers/mtd/trxsplit.c | 16 +++------------- .../adm5120/files/drivers/usb/host/adm5120-hcd.c | 4 ++-- 7 files changed, 23 insertions(+), 65 deletions(-) (limited to 'target/linux/adm5120/files/drivers') diff --git a/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c b/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c index fbbf313d9d..6cb8e55588 100644 --- a/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c +++ b/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c @@ -12,9 +12,9 @@ * their RouterBoard 1xx and 5xx series devices. The original Mikrotik code * seems not to have a license. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. * */ @@ -32,7 +32,7 @@ #include #define DRV_NAME "pata-rb153-cf" -#define DRV_VERSION "0.2.2" +#define DRV_VERSION "0.3.0" #define DRV_DESC "PATA driver for RouterBOARD 153 Compact Flash" #define RB153_CF_MAXPORTS 1 @@ -304,7 +304,7 @@ static void __exit rb153_pata_module_exit(void) MODULE_AUTHOR("Gabor Juhos "); MODULE_DESCRIPTION(DRV_DESC); MODULE_VERSION(DRV_VERSION); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); module_init(rb153_pata_module_init); module_exit(rb153_pata_module_exit); diff --git a/target/linux/adm5120/files/drivers/leds/leds-adm5120.c b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c index 9bd3af6e8d..95b90fa474 100644 --- a/target/linux/adm5120/files/drivers/leds/leds-adm5120.c +++ b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c @@ -6,20 +6,9 @@ * Copyright (C) 2007,2008 OpenWrt.org * Copyright (C) 2007,2008 Gabor Juhos * - * 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 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. - * - * 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. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. * */ @@ -394,5 +383,5 @@ module_exit(adm5120_leds_exit); MODULE_AUTHOR("Gabor Juhos "); MODULE_DESCRIPTION(DRV_DESC); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/target/linux/adm5120/files/drivers/leds/ledtrig-adm5120-switch.c b/target/linux/adm5120/files/drivers/leds/ledtrig-adm5120-switch.c index 345909d231..b1b9c503c9 100644 --- a/target/linux/adm5120/files/drivers/leds/ledtrig-adm5120-switch.c +++ b/target/linux/adm5120/files/drivers/leds/ledtrig-adm5120-switch.c @@ -146,4 +146,4 @@ module_exit(adm5120_switch_trig_exit); MODULE_AUTHOR("Bernhard Held , " "Gabor Juhos "); MODULE_DESCRIPTION(DRV_DESC); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c index b84492f46b..c637c4ff0d 100644 --- a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c +++ b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c @@ -10,20 +10,9 @@ * Copyright (C) 2003 MontaVista Software Inc. * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net * - * 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 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. - * - * 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. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. * */ @@ -577,6 +566,6 @@ static void __exit adm5120_flash_exit(void) module_init(adm5120_flash_init); module_exit(adm5120_flash_exit); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Gabor Juhos "); MODULE_DESCRIPTION(DRV_DESC); diff --git a/target/linux/adm5120/files/drivers/mtd/myloader.c b/target/linux/adm5120/files/drivers/mtd/myloader.c index 24d41c559b..9dab9d18da 100644 --- a/target/linux/adm5120/files/drivers/mtd/myloader.c +++ b/target/linux/adm5120/files/drivers/mtd/myloader.c @@ -10,20 +10,10 @@ * This file was based on drivers/mtd/redboot.c * Author: Red Hat, Inc. - David Woodhouse * - * 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 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. - * - * 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 @@ -174,4 +164,4 @@ module_exit(mylo_mtd_parser_exit); MODULE_AUTHOR("Gabor Juhos "); MODULE_DESCRIPTION("Parsing code for MyLoader partition tables"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/target/linux/adm5120/files/drivers/mtd/trxsplit.c b/target/linux/adm5120/files/drivers/mtd/trxsplit.c index caf6b76a5a..49eb0f979e 100644 --- a/target/linux/adm5120/files/drivers/mtd/trxsplit.c +++ b/target/linux/adm5120/files/drivers/mtd/trxsplit.c @@ -4,20 +4,10 @@ * Copyright (C) 2007 OpenWrt.org * Copyright (C) Gabor Juhos * - * 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 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. - * - * 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 diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c index 725583cc83..42eb8f5443 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c @@ -45,7 +45,7 @@ #include "../core/hcd.h" #include "../core/hub.h" -#define DRIVER_VERSION "0.16.1" +#define DRIVER_VERSION "0.16.2" #define DRIVER_AUTHOR "Gabor Juhos " #define DRIVER_DESC "ADMtek USB 1.1 Host Controller Driver" @@ -826,4 +826,4 @@ module_exit(admhc_hcd_mod_exit); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_INFO); MODULE_VERSION(DRIVER_VERSION); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); -- cgit v1.2.3