Commit 327fceff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8282d5af acf9e67a

drivers/watchdog/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ config GPIO_WATCHDOG_ARCH_INITCALL 
config LENOVO_SE10_WDT

	tristate "Lenovo SE10 Watchdog"

	depends on (X86 && DMI) || COMPILE_TEST

	depends on HAS_IOPORT

	select WATCHDOG_CORE

	help

	  If you say yes here you get support for the watchdog

drivers/watchdog/menz69_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static struct mcb_driver men_z069_driver = { 
module_mcb_driver(men_z069_driver);



MODULE_AUTHOR("Johannes Thumshirn <jth@kernel.org>");

MODULE_DESCRIPTION("Watchdog driver for the MEN z069 IP-Core");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("mcb:16z069");

MODULE_IMPORT_NS(MCB);

drivers/watchdog/omap_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -370,5 +370,6 @@ static struct platform_driver omap_wdt_driver = { 
module_platform_driver(omap_wdt_driver);



MODULE_AUTHOR("George G. Davis");

MODULE_DESCRIPTION("Driver for the TI OMAP 16xx/24xx/34xx 32KHz (non-secure) watchdog");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:omap_wdt");

drivers/watchdog/simatic-ipc-wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ static struct platform_driver simatic_ipc_wdt_driver = { 


module_platform_driver(simatic_ipc_wdt_driver);



MODULE_DESCRIPTION("Siemens SIMATIC IPC driver for Watchdogs");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:" KBUILD_MODNAME);

MODULE_AUTHOR("Gerd Haeussler <gerd.haeussler.ext@siemens.com>");

drivers/watchdog/ts4800_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -200,5 +200,6 @@ static struct platform_driver ts4800_wdt_driver = { 
module_platform_driver(ts4800_wdt_driver);



MODULE_AUTHOR("Damien Riegel <damien.riegel@savoirfairelinux.com>");

MODULE_DESCRIPTION("Watchdog driver for TS-4800 based boards");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:ts4800_wdt");