On 02/20/2018 11:45 AM, Marcus Folkesson wrote: > - Add SPDX identifier > - Remove boiler plate license text > - If MODULE_LICENSE and boiler plate does not match, go for boiler plate > license > > Signed-off-by: Marcus Folkesson <marcus.folkesson@xxxxxxxxx> > Acked-by: Adam Thomson <Adam.Thomson.Opensource@xxxxxxxxxxx> > Acked-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx> > Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx> > Acked-by: Michal Simek <michal.simek@xxxxxxxxxx> > --- > > Notes: > v2: > - Put back removed copyright texts for meson_gxbb_wdt and coh901327_wdt > - Change to BSD-3-Clause for meson_gxbb_wdt > v1: Please have an extra look at meson_gxbb_wdt.c > > drivers/watchdog/acquirewdt.c | 6 +--- [...] > drivers/watchdog/mpc8xxx_wdt.c | 6 +--- > drivers/watchdog/mt7621_wdt.c | 5 +--- > drivers/watchdog/mtk_wdt.c | 11 +------- > drivers/watchdog/mtx-1_wdt.c | 11 +------- > drivers/watchdog/mv64x60_wdt.c | 6 ++-- [...] > diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c > index 7ed417a765c7..498e7d4e1b66 100644 > --- a/drivers/watchdog/mtk_wdt.c > +++ b/drivers/watchdog/mtk_wdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Mediatek Watchdog Driver > * > @@ -5,16 +6,6 @@ > * > * Matthias Brugger <matthias.bgg@xxxxxxxxx> > * > - * 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. > - * > * Based on sunxi_wdt.c > */ > Acked-by: Matthias Brugger <matthias.bgg@xxxxxxxxx>
