From: Kay Sievers Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable watchdog drivers, to re-enable auto loading. [dbrownell@users.sourceforge.net: more drivers; registration fixes] Signed-off-by: Kay Sievers Signed-off-by: David Brownell Cc: Wim Van Sebroeck Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/watchdog/at32ap700x_wdt.c | 3 +++ drivers/watchdog/at91rm9200_wdt.c | 1 + drivers/watchdog/davinci_wdt.c | 2 ++ drivers/watchdog/ks8695_wdt.c | 1 + drivers/watchdog/mpc83xx_wdt.c | 2 ++ drivers/watchdog/mpcore_wdt.c | 3 +++ drivers/watchdog/mtx-1_wdt.c | 2 ++ drivers/watchdog/mv64x60_wdt.c | 1 + drivers/watchdog/omap_wdt.c | 1 + drivers/watchdog/pnx4008_wdt.c | 2 ++ drivers/watchdog/s3c2410_wdt.c | 1 + drivers/watchdog/txx9wdt.c | 1 + 12 files changed, 20 insertions(+) diff -puN drivers/watchdog/at32ap700x_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug drivers/watchdog/at32ap700x_wdt.c --- a/drivers/watchdog/at32ap700x_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug +++ a/drivers/watchdog/at32ap700x_wdt.c @@ -418,6 +418,9 @@ static int at32_wdt_resume(struct platfo #define at32_wdt_resume NULL #endif +/* work with hotplug and coldplug */ +MODULE_ALIAS("platform:at32_wdt"); + static struct platform_driver at32_wdt_driver = { .remove = __exit_p(at32_wdt_remove), .suspend = at32_wdt_suspend, diff -puN drivers/watchdog/at91rm9200_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug drivers/watchdog/at91rm9200_wdt.c --- a/drivers/watchdog/at91rm9200_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug +++ a/drivers/watchdog/at91rm9200_wdt.c @@ -286,3 +286,4 @@ MODULE_AUTHOR("Andrew Victor"); MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200"); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS("platform:at91_wdt"); diff -puN drivers/watchdog/davinci_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug drivers/watchdog/davinci_wdt.c --- a/drivers/watchdog/davinci_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug +++ a/drivers/watchdog/davinci_wdt.c @@ -248,6 +248,7 @@ static int davinci_wdt_remove(struct pla static struct platform_driver platform_wdt_driver = { .driver = { .name = "watchdog", + .owner = THIS_MODULE, }, .probe = davinci_wdt_probe, .remove = davinci_wdt_remove, @@ -277,3 +278,4 @@ MODULE_PARM_DESC(heartbeat, MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS("platform:watchdog"); diff -puN drivers/watchdog/ks8695_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug drivers/watchdog/ks8695_wdt.c --- a/drivers/watchdog/ks8695_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug +++ a/drivers/watchdog/ks8695_wdt.c @@ -306,3 +306,4 @@ MODULE_AUTHOR("Andrew Victor"); MODULE_DESCRIPTION("Watchdog driver for KS8695"); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS("platform:ks8695_wdt"); diff -puN drivers/watchdog/mpc83xx_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug drivers/watchdog/mpc83xx_wdt.c --- a/drivers/watchdog/mpc83xx_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug +++ a/drivers/watchdog/mpc83xx_wdt.c @@ -206,6 +206,7 @@ static struct platform_driver mpc83xx_wd .remove = __devexit_p(mpc83xx_wdt_remove), .driver = { .name = "mpc83xx_wdt", + .owner = THIS_MODULE, }, }; @@ -226,3 +227,4 @@ MODULE_AUTHOR("Dave Updegraff, Kumar Gal MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx uProcessor"); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS("platform:mpc83xx_wdt"); diff -puN drivers/watchdog/mpcore_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug drivers/watchdog/mpcore_wdt.c --- a/drivers/watchdog/mpcore_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug +++ a/drivers/watchdog/mpcore_wdt.c @@ -392,6 +392,9 @@ static int __devexit mpcore_wdt_remove(s return 0; } +/* work with hotplug and coldplug */ +MODULE_ALIAS("platform:mpcore_wdt"); + static struct platform_driver mpcore_wdt_driver = { .probe = mpcore_wdt_probe, .remove = __devexit_p(mpcore_wdt_remove), diff -puN drivers/watchdog/mtx-1_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug drivers/watchdog/mtx-1_wdt.c --- a/drivers/watchdog/mtx-1_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug +++ a/drivers/watchdog/mtx-1_wdt.c @@ -243,6 +243,7 @@ static struct platform_driver mtx1_wdt = .probe = mtx1_wdt_probe, .remove = mtx1_wdt_remove, .driver.name = "mtx1-wdt", + .driver.owner = THIS_MODULE, }; static int __init mtx1_wdt_init(void) @@ -262,3 +263,4 @@ MODULE_AUTHOR("Michael Stickel, Florian MODULE_DESCRIPTION("Driver for the MTX-1 watchdog"); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS("platform:mtx1-wdt"); diff -puN drivers/watchdog/mv64x60_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug drivers/watchdog/mv64x60_wdt.c --- a/drivers/watchdog/mv64x60_wdt.c~watchdog-fix-platform-driver-hotplug-coldplug +++ a/drivers/watchdog/mv64x60_wdt.c @@ -324,3 +324,4 @@ MODULE_AUTHOR("James Chapman