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

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
...@@ -257,6 +257,7 @@ config GPIO_WATCHDOG_ARCH_INITCALL ...@@ -257,6 +257,7 @@ config GPIO_WATCHDOG_ARCH_INITCALL
config LENOVO_SE10_WDT config LENOVO_SE10_WDT
tristate "Lenovo SE10 Watchdog" tristate "Lenovo SE10 Watchdog"
depends on (X86 && DMI) || COMPILE_TEST depends on (X86 && DMI) || COMPILE_TEST
depends on HAS_IOPORT
select WATCHDOG_CORE select WATCHDOG_CORE
help help
If you say yes here you get support for the watchdog If you say yes here you get support for the watchdog
......
...@@ -161,6 +161,7 @@ static struct mcb_driver men_z069_driver = { ...@@ -161,6 +161,7 @@ static struct mcb_driver men_z069_driver = {
module_mcb_driver(men_z069_driver); module_mcb_driver(men_z069_driver);
MODULE_AUTHOR("Johannes Thumshirn <jth@kernel.org>"); MODULE_AUTHOR("Johannes Thumshirn <jth@kernel.org>");
MODULE_DESCRIPTION("Watchdog driver for the MEN z069 IP-Core");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("mcb:16z069"); MODULE_ALIAS("mcb:16z069");
MODULE_IMPORT_NS(MCB); MODULE_IMPORT_NS(MCB);
...@@ -370,5 +370,6 @@ static struct platform_driver omap_wdt_driver = { ...@@ -370,5 +370,6 @@ static struct platform_driver omap_wdt_driver = {
module_platform_driver(omap_wdt_driver); module_platform_driver(omap_wdt_driver);
MODULE_AUTHOR("George G. Davis"); MODULE_AUTHOR("George G. Davis");
MODULE_DESCRIPTION("Driver for the TI OMAP 16xx/24xx/34xx 32KHz (non-secure) watchdog");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:omap_wdt"); MODULE_ALIAS("platform:omap_wdt");
...@@ -227,6 +227,7 @@ static struct platform_driver simatic_ipc_wdt_driver = { ...@@ -227,6 +227,7 @@ static struct platform_driver simatic_ipc_wdt_driver = {
module_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_LICENSE("GPL v2");
MODULE_ALIAS("platform:" KBUILD_MODNAME); MODULE_ALIAS("platform:" KBUILD_MODNAME);
MODULE_AUTHOR("Gerd Haeussler <gerd.haeussler.ext@siemens.com>"); MODULE_AUTHOR("Gerd Haeussler <gerd.haeussler.ext@siemens.com>");
...@@ -200,5 +200,6 @@ static struct platform_driver ts4800_wdt_driver = { ...@@ -200,5 +200,6 @@ static struct platform_driver ts4800_wdt_driver = {
module_platform_driver(ts4800_wdt_driver); module_platform_driver(ts4800_wdt_driver);
MODULE_AUTHOR("Damien Riegel <damien.riegel@savoirfairelinux.com>"); MODULE_AUTHOR("Damien Riegel <damien.riegel@savoirfairelinux.com>");
MODULE_DESCRIPTION("Watchdog driver for TS-4800 based boards");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:ts4800_wdt"); MODULE_ALIAS("platform:ts4800_wdt");
...@@ -118,6 +118,7 @@ static struct platform_driver twl4030_wdt_driver = { ...@@ -118,6 +118,7 @@ static struct platform_driver twl4030_wdt_driver = {
module_platform_driver(twl4030_wdt_driver); module_platform_driver(twl4030_wdt_driver);
MODULE_AUTHOR("Nokia Corporation"); MODULE_AUTHOR("Nokia Corporation");
MODULE_DESCRIPTION("TWL4030 Watchdog");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:twl4030_wdt"); MODULE_ALIAS("platform:twl4030_wdt");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment