Skip to content

Commit 327fcef

Browse files
committed
Merge tag 'linux-watchdog-6.10-rc-fixes' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck: - lenovo_se10_wdt: add HAS_IOPORT dependency - add missing MODULE_DESCRIPTION() macros * tag 'linux-watchdog-6.10-rc-fixes' of git://www.linux-watchdog.org/linux-watchdog: watchdog: add missing MODULE_DESCRIPTION() macros watchdog: lenovo_se10_wdt: add HAS_IOPORT dependency
2 parents 8282d5a + acf9e67 commit 327fcef

File tree

6 files changed

+6
-0
lines changed

6 files changed

+6
-0
lines changed

drivers/watchdog/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ config GPIO_WATCHDOG_ARCH_INITCALL
257257
config LENOVO_SE10_WDT
258258
tristate "Lenovo SE10 Watchdog"
259259
depends on (X86 && DMI) || COMPILE_TEST
260+
depends on HAS_IOPORT
260261
select WATCHDOG_CORE
261262
help
262263
If you say yes here you get support for the watchdog

drivers/watchdog/menz69_wdt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ static struct mcb_driver men_z069_driver = {
161161
module_mcb_driver(men_z069_driver);
162162

163163
MODULE_AUTHOR("Johannes Thumshirn <jth@kernel.org>");
164+
MODULE_DESCRIPTION("Watchdog driver for the MEN z069 IP-Core");
164165
MODULE_LICENSE("GPL v2");
165166
MODULE_ALIAS("mcb:16z069");
166167
MODULE_IMPORT_NS(MCB);

drivers/watchdog/omap_wdt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,5 +370,6 @@ static struct platform_driver omap_wdt_driver = {
370370
module_platform_driver(omap_wdt_driver);
371371

372372
MODULE_AUTHOR("George G. Davis");
373+
MODULE_DESCRIPTION("Driver for the TI OMAP 16xx/24xx/34xx 32KHz (non-secure) watchdog");
373374
MODULE_LICENSE("GPL");
374375
MODULE_ALIAS("platform:omap_wdt");

drivers/watchdog/simatic-ipc-wdt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ static struct platform_driver simatic_ipc_wdt_driver = {
227227

228228
module_platform_driver(simatic_ipc_wdt_driver);
229229

230+
MODULE_DESCRIPTION("Siemens SIMATIC IPC driver for Watchdogs");
230231
MODULE_LICENSE("GPL v2");
231232
MODULE_ALIAS("platform:" KBUILD_MODNAME);
232233
MODULE_AUTHOR("Gerd Haeussler <gerd.haeussler.ext@siemens.com>");

drivers/watchdog/ts4800_wdt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,5 +200,6 @@ static struct platform_driver ts4800_wdt_driver = {
200200
module_platform_driver(ts4800_wdt_driver);
201201

202202
MODULE_AUTHOR("Damien Riegel <damien.riegel@savoirfairelinux.com>");
203+
MODULE_DESCRIPTION("Watchdog driver for TS-4800 based boards");
203204
MODULE_LICENSE("GPL v2");
204205
MODULE_ALIAS("platform:ts4800_wdt");

drivers/watchdog/twl4030_wdt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ static struct platform_driver twl4030_wdt_driver = {
118118
module_platform_driver(twl4030_wdt_driver);
119119

120120
MODULE_AUTHOR("Nokia Corporation");
121+
MODULE_DESCRIPTION("TWL4030 Watchdog");
121122
MODULE_LICENSE("GPL");
122123
MODULE_ALIAS("platform:twl4030_wdt");
123124

0 commit comments

Comments
 (0)