diff options
87 files changed, 6 insertions, 112 deletions
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c index 24a517777fa0..5cf1621def9c 100644 --- a/drivers/watchdog/acquirewdt.c +++ b/drivers/watchdog/acquirewdt.c | |||
@@ -60,8 +60,7 @@ | |||
60 | #include <linux/types.h> /* For standard types (like size_t) */ | 60 | #include <linux/types.h> /* For standard types (like size_t) */ |
61 | #include <linux/errno.h> /* For the -ENODEV/... values */ | 61 | #include <linux/errno.h> /* For the -ENODEV/... values */ |
62 | #include <linux/kernel.h> /* For printk/panic/... */ | 62 | #include <linux/kernel.h> /* For printk/panic/... */ |
63 | #include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV | 63 | #include <linux/miscdevice.h> /* For struct miscdevice */ |
64 | (WATCHDOG_MINOR) */ | ||
65 | #include <linux/watchdog.h> /* For the watchdog specific items */ | 64 | #include <linux/watchdog.h> /* For the watchdog specific items */ |
66 | #include <linux/fs.h> /* For file operations */ | 65 | #include <linux/fs.h> /* For file operations */ |
67 | #include <linux/ioport.h> /* For io-port access */ | 66 | #include <linux/ioport.h> /* For io-port access */ |
@@ -337,4 +336,3 @@ module_exit(acq_exit); | |||
337 | MODULE_AUTHOR("David Woodhouse"); | 336 | MODULE_AUTHOR("David Woodhouse"); |
338 | MODULE_DESCRIPTION("Acquire Inc. Single Board Computer Watchdog Timer driver"); | 337 | MODULE_DESCRIPTION("Acquire Inc. Single Board Computer Watchdog Timer driver"); |
339 | MODULE_LICENSE("GPL"); | 338 | MODULE_LICENSE("GPL"); |
340 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c index cc6702fc5268..a8961addc59c 100644 --- a/drivers/watchdog/advantechwdt.c +++ b/drivers/watchdog/advantechwdt.c | |||
@@ -345,4 +345,3 @@ module_exit(advwdt_exit); | |||
345 | MODULE_LICENSE("GPL"); | 345 | MODULE_LICENSE("GPL"); |
346 | MODULE_AUTHOR("Marek Michalkiewicz <marekm@linux.org.pl>"); | 346 | MODULE_AUTHOR("Marek Michalkiewicz <marekm@linux.org.pl>"); |
347 | MODULE_DESCRIPTION("Advantech Single Board Computer WDT driver"); | 347 | MODULE_DESCRIPTION("Advantech Single Board Computer WDT driver"); |
348 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c index 41b84936a521..fbb7b94cabfd 100644 --- a/drivers/watchdog/alim1535_wdt.c +++ b/drivers/watchdog/alim1535_wdt.c | |||
@@ -452,4 +452,3 @@ module_exit(watchdog_exit); | |||
452 | MODULE_AUTHOR("Alan Cox"); | 452 | MODULE_AUTHOR("Alan Cox"); |
453 | MODULE_DESCRIPTION("ALi M1535 PMU Watchdog Timer driver"); | 453 | MODULE_DESCRIPTION("ALi M1535 PMU Watchdog Timer driver"); |
454 | MODULE_LICENSE("GPL"); | 454 | MODULE_LICENSE("GPL"); |
455 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c index 5eee55012e33..12f0b762b528 100644 --- a/drivers/watchdog/alim7101_wdt.c +++ b/drivers/watchdog/alim7101_wdt.c | |||
@@ -425,4 +425,3 @@ MODULE_DEVICE_TABLE(pci, alim7101_pci_tbl); | |||
425 | MODULE_AUTHOR("Steve Hill"); | 425 | MODULE_AUTHOR("Steve Hill"); |
426 | MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver"); | 426 | MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver"); |
427 | MODULE_LICENSE("GPL"); | 427 | MODULE_LICENSE("GPL"); |
428 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c index b3709f9cf5be..3a996576343a 100644 --- a/drivers/watchdog/ar7_wdt.c +++ b/drivers/watchdog/ar7_wdt.c | |||
@@ -46,7 +46,6 @@ | |||
46 | MODULE_AUTHOR("Nicolas Thill <nico@openwrt.org>"); | 46 | MODULE_AUTHOR("Nicolas Thill <nico@openwrt.org>"); |
47 | MODULE_DESCRIPTION(LONGNAME); | 47 | MODULE_DESCRIPTION(LONGNAME); |
48 | MODULE_LICENSE("GPL"); | 48 | MODULE_LICENSE("GPL"); |
49 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
50 | 49 | ||
51 | static int margin = 60; | 50 | static int margin = 60; |
52 | module_param(margin, int, 0); | 51 | module_param(margin, int, 0); |
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c index b178e717ef09..afe7d17e6776 100644 --- a/drivers/watchdog/at32ap700x_wdt.c +++ b/drivers/watchdog/at32ap700x_wdt.c | |||
@@ -434,4 +434,3 @@ module_platform_driver_probe(at32_wdt_driver, at32_wdt_probe); | |||
434 | MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); | 434 | MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); |
435 | MODULE_DESCRIPTION("Watchdog driver for Atmel AT32AP700X"); | 435 | MODULE_DESCRIPTION("Watchdog driver for Atmel AT32AP700X"); |
436 | MODULE_LICENSE("GPL"); | 436 | MODULE_LICENSE("GPL"); |
437 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index aa5cb56cf68a..dee6cc21d270 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c | |||
@@ -297,5 +297,4 @@ module_exit(at91_wdt_exit); | |||
297 | MODULE_AUTHOR("Andrew Victor"); | 297 | MODULE_AUTHOR("Andrew Victor"); |
298 | MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200"); | 298 | MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200"); |
299 | MODULE_LICENSE("GPL"); | 299 | MODULE_LICENSE("GPL"); |
300 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
301 | MODULE_ALIAS("platform:at91_wdt"); | 300 | MODULE_ALIAS("platform:at91_wdt"); |
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c index 37cb09b27b63..9fa1f69dac13 100644 --- a/drivers/watchdog/ath79_wdt.c +++ b/drivers/watchdog/ath79_wdt.c | |||
@@ -329,4 +329,3 @@ MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org"); | |||
329 | MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org"); | 329 | MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org"); |
330 | MODULE_LICENSE("GPL v2"); | 330 | MODULE_LICENSE("GPL v2"); |
331 | MODULE_ALIAS("platform:" DRIVER_NAME); | 331 | MODULE_ALIAS("platform:" DRIVER_NAME); |
332 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index 61566fc47f84..a6a2cebb2587 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c | |||
@@ -186,4 +186,3 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" | |||
186 | MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>"); | 186 | MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>"); |
187 | MODULE_DESCRIPTION("Driver for Broadcom BCM2835 watchdog timer"); | 187 | MODULE_DESCRIPTION("Driver for Broadcom BCM2835 watchdog timer"); |
188 | MODULE_LICENSE("GPL"); | 188 | MODULE_LICENSE("GPL"); |
189 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c index a14a58d9d110..4eb188b87f8e 100644 --- a/drivers/watchdog/bcm63xx_wdt.c +++ b/drivers/watchdog/bcm63xx_wdt.c | |||
@@ -317,5 +317,4 @@ MODULE_AUTHOR("Miguel Gaio <miguel.gaio@efixo.com>"); | |||
317 | MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); | 317 | MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); |
318 | MODULE_DESCRIPTION("Driver for the Broadcom BCM63xx SoC watchdog"); | 318 | MODULE_DESCRIPTION("Driver for the Broadcom BCM63xx SoC watchdog"); |
319 | MODULE_LICENSE("GPL"); | 319 | MODULE_LICENSE("GPL"); |
320 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
321 | MODULE_ALIAS("platform:bcm63xx-wdt"); | 320 | MODULE_ALIAS("platform:bcm63xx-wdt"); |
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c index 5d36d6fb4969..a3b6a5b30f9f 100644 --- a/drivers/watchdog/bfin_wdt.c +++ b/drivers/watchdog/bfin_wdt.c | |||
@@ -465,7 +465,6 @@ module_exit(bfin_wdt_exit); | |||
465 | MODULE_AUTHOR("Michele d'Amico, Mike Frysinger <vapier@gentoo.org>"); | 465 | MODULE_AUTHOR("Michele d'Amico, Mike Frysinger <vapier@gentoo.org>"); |
466 | MODULE_DESCRIPTION("Blackfin Watchdog Device Driver"); | 466 | MODULE_DESCRIPTION("Blackfin Watchdog Device Driver"); |
467 | MODULE_LICENSE("GPL"); | 467 | MODULE_LICENSE("GPL"); |
468 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
469 | 468 | ||
470 | module_param(timeout, uint, 0); | 469 | module_param(timeout, uint, 0); |
471 | MODULE_PARM_DESC(timeout, | 470 | MODULE_PARM_DESC(timeout, |
diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c index f270bb7bc456..f7ae49edb518 100644 --- a/drivers/watchdog/cpu5wdt.c +++ b/drivers/watchdog/cpu5wdt.c | |||
@@ -289,7 +289,6 @@ MODULE_AUTHOR("Heiko Ronsdorf <hero@ihg.uni-duisburg.de>"); | |||
289 | MODULE_DESCRIPTION("sma cpu5 watchdog driver"); | 289 | MODULE_DESCRIPTION("sma cpu5 watchdog driver"); |
290 | MODULE_SUPPORTED_DEVICE("sma cpu5 watchdog"); | 290 | MODULE_SUPPORTED_DEVICE("sma cpu5 watchdog"); |
291 | MODULE_LICENSE("GPL"); | 291 | MODULE_LICENSE("GPL"); |
292 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
293 | 292 | ||
294 | module_param(port, int, 0); | 293 | module_param(port, int, 0); |
295 | MODULE_PARM_DESC(port, "base address of watchdog card, default is 0x91"); | 294 | MODULE_PARM_DESC(port, "base address of watchdog card, default is 0x91"); |
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index bead7740c86a..dd625cca1ae5 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c | |||
@@ -267,5 +267,4 @@ MODULE_PARM_DESC(heartbeat, | |||
267 | __MODULE_STRING(DEFAULT_HEARTBEAT)); | 267 | __MODULE_STRING(DEFAULT_HEARTBEAT)); |
268 | 268 | ||
269 | MODULE_LICENSE("GPL"); | 269 | MODULE_LICENSE("GPL"); |
270 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
271 | MODULE_ALIAS("platform:watchdog"); | 270 | MODULE_ALIAS("platform:watchdog"); |
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index aed1cbe81882..42cfd79edf2a 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c | |||
@@ -352,4 +352,3 @@ module_platform_driver(dw_wdt_driver); | |||
352 | MODULE_AUTHOR("Jamie Iles"); | 352 | MODULE_AUTHOR("Jamie Iles"); |
353 | MODULE_DESCRIPTION("Synopsys DesignWare Watchdog Driver"); | 353 | MODULE_DESCRIPTION("Synopsys DesignWare Watchdog Driver"); |
354 | MODULE_LICENSE("GPL"); | 354 | MODULE_LICENSE("GPL"); |
355 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index e0574844c313..833e81311848 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c | |||
@@ -179,4 +179,3 @@ MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>," | |||
179 | MODULE_DESCRIPTION("EP93xx Watchdog"); | 179 | MODULE_DESCRIPTION("EP93xx Watchdog"); |
180 | MODULE_LICENSE("GPL"); | 180 | MODULE_LICENSE("GPL"); |
181 | MODULE_VERSION(WDT_VERSION); | 181 | MODULE_VERSION(WDT_VERSION); |
182 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c index cd31b8a2a729..23ee53240c4c 100644 --- a/drivers/watchdog/eurotechwdt.c +++ b/drivers/watchdog/eurotechwdt.c | |||
@@ -477,4 +477,3 @@ module_exit(eurwdt_exit); | |||
477 | MODULE_AUTHOR("Rodolfo Giometti"); | 477 | MODULE_AUTHOR("Rodolfo Giometti"); |
478 | MODULE_DESCRIPTION("Driver for Eurotech CPU-1220/1410 on board watchdog"); | 478 | MODULE_DESCRIPTION("Driver for Eurotech CPU-1220/1410 on board watchdog"); |
479 | MODULE_LICENSE("GPL"); | 479 | MODULE_LICENSE("GPL"); |
480 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c index 3755833430dc..25beb30878d7 100644 --- a/drivers/watchdog/gef_wdt.c +++ b/drivers/watchdog/gef_wdt.c | |||
@@ -331,5 +331,4 @@ module_exit(gef_wdt_exit); | |||
331 | MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>"); | 331 | MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>"); |
332 | MODULE_DESCRIPTION("GE watchdog driver"); | 332 | MODULE_DESCRIPTION("GE watchdog driver"); |
333 | MODULE_LICENSE("GPL"); | 333 | MODULE_LICENSE("GPL"); |
334 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
335 | MODULE_ALIAS("platform:gef_wdt"); | 334 | MODULE_ALIAS("platform:gef_wdt"); |
diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c index fcd599d4e225..4a6ae84b42bc 100644 --- a/drivers/watchdog/geodewdt.c +++ b/drivers/watchdog/geodewdt.c | |||
@@ -297,4 +297,3 @@ module_exit(geodewdt_exit); | |||
297 | MODULE_AUTHOR("Advanced Micro Devices, Inc"); | 297 | MODULE_AUTHOR("Advanced Micro Devices, Inc"); |
298 | MODULE_DESCRIPTION("Geode GX/LX Watchdog Driver"); | 298 | MODULE_DESCRIPTION("Geode GX/LX Watchdog Driver"); |
299 | MODULE_LICENSE("GPL"); | 299 | MODULE_LICENSE("GPL"); |
300 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 19f3c3fc65f4..45b979d9dd13 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
@@ -881,7 +881,6 @@ MODULE_AUTHOR("Tom Mingarelli"); | |||
881 | MODULE_DESCRIPTION("hp watchdog driver"); | 881 | MODULE_DESCRIPTION("hp watchdog driver"); |
882 | MODULE_LICENSE("GPL"); | 882 | MODULE_LICENSE("GPL"); |
883 | MODULE_VERSION(HPWDT_VERSION); | 883 | MODULE_VERSION(HPWDT_VERSION); |
884 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
885 | 884 | ||
886 | module_param(soft_margin, int, 0); | 885 | module_param(soft_margin, int, 0); |
887 | MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); | 886 | MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); |
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c index 2b2ea13d03ea..a72fe9361ddf 100644 --- a/drivers/watchdog/i6300esb.c +++ b/drivers/watchdog/i6300esb.c | |||
@@ -497,4 +497,3 @@ module_pci_driver(esb_driver); | |||
497 | MODULE_AUTHOR("Ross Biro and David Härdeman"); | 497 | MODULE_AUTHOR("Ross Biro and David Härdeman"); |
498 | MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets"); | 498 | MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets"); |
499 | MODULE_LICENSE("GPL"); | 499 | MODULE_LICENSE("GPL"); |
500 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 439b160b3e0f..04f8af65acfd 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c | |||
@@ -56,8 +56,6 @@ | |||
56 | #include <linux/types.h> /* For standard types (like size_t) */ | 56 | #include <linux/types.h> /* For standard types (like size_t) */ |
57 | #include <linux/errno.h> /* For the -ENODEV/... values */ | 57 | #include <linux/errno.h> /* For the -ENODEV/... values */ |
58 | #include <linux/kernel.h> /* For printk/panic/... */ | 58 | #include <linux/kernel.h> /* For printk/panic/... */ |
59 | #include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV | ||
60 | (WATCHDOG_MINOR) */ | ||
61 | #include <linux/watchdog.h> /* For the watchdog specific items */ | 59 | #include <linux/watchdog.h> /* For the watchdog specific items */ |
62 | #include <linux/init.h> /* For __init/__exit/... */ | 60 | #include <linux/init.h> /* For __init/__exit/... */ |
63 | #include <linux/fs.h> /* For file operations */ | 61 | #include <linux/fs.h> /* For file operations */ |
@@ -582,5 +580,4 @@ MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>"); | |||
582 | MODULE_DESCRIPTION("Intel TCO WatchDog Timer Driver"); | 580 | MODULE_DESCRIPTION("Intel TCO WatchDog Timer Driver"); |
583 | MODULE_VERSION(DRV_VERSION); | 581 | MODULE_VERSION(DRV_VERSION); |
584 | MODULE_LICENSE("GPL"); | 582 | MODULE_LICENSE("GPL"); |
585 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
586 | MODULE_ALIAS("platform:" DRV_NAME); | 583 | MODULE_ALIAS("platform:" DRV_NAME); |
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c index eb6b5cc98ec6..7ae36690c449 100644 --- a/drivers/watchdog/ib700wdt.c +++ b/drivers/watchdog/ib700wdt.c | |||
@@ -382,6 +382,5 @@ module_exit(ibwdt_exit); | |||
382 | MODULE_AUTHOR("Charles Howes <chowes@vsol.net>"); | 382 | MODULE_AUTHOR("Charles Howes <chowes@vsol.net>"); |
383 | MODULE_DESCRIPTION("IB700 SBC watchdog driver"); | 383 | MODULE_DESCRIPTION("IB700 SBC watchdog driver"); |
384 | MODULE_LICENSE("GPL"); | 384 | MODULE_LICENSE("GPL"); |
385 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
386 | 385 | ||
387 | /* end of ib700wdt.c */ | 386 | /* end of ib700wdt.c */ |
diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c index bc3fb8fe89ab..db0a34460e57 100644 --- a/drivers/watchdog/ibmasr.c +++ b/drivers/watchdog/ibmasr.c | |||
@@ -419,4 +419,3 @@ MODULE_PARM_DESC(nowayout, | |||
419 | MODULE_DESCRIPTION("IBM Automatic Server Restart driver"); | 419 | MODULE_DESCRIPTION("IBM Automatic Server Restart driver"); |
420 | MODULE_AUTHOR("Andrey Panin"); | 420 | MODULE_AUTHOR("Andrey Panin"); |
421 | MODULE_LICENSE("GPL"); | 421 | MODULE_LICENSE("GPL"); |
422 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c index e24ef6a6e064..70a240297c6d 100644 --- a/drivers/watchdog/ie6xx_wdt.c +++ b/drivers/watchdog/ie6xx_wdt.c | |||
@@ -344,5 +344,4 @@ module_exit(ie6xx_wdt_exit); | |||
344 | MODULE_AUTHOR("Alexander Stein <alexander.stein@systec-electronic.com>"); | 344 | MODULE_AUTHOR("Alexander Stein <alexander.stein@systec-electronic.com>"); |
345 | MODULE_DESCRIPTION("Intel Atom E6xx Watchdog Device Driver"); | 345 | MODULE_DESCRIPTION("Intel Atom E6xx Watchdog Device Driver"); |
346 | MODULE_LICENSE("GPL"); | 346 | MODULE_LICENSE("GPL"); |
347 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
348 | MODULE_ALIAS("platform:" DRIVER_NAME); | 347 | MODULE_ALIAS("platform:" DRIVER_NAME); |
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 17680aa6cb32..b4786bccc42c 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c | |||
@@ -339,5 +339,4 @@ module_platform_driver_probe(imx2_wdt_driver, imx2_wdt_probe); | |||
339 | MODULE_AUTHOR("Wolfram Sang"); | 339 | MODULE_AUTHOR("Wolfram Sang"); |
340 | MODULE_DESCRIPTION("Watchdog driver for IMX2 and later"); | 340 | MODULE_DESCRIPTION("Watchdog driver for IMX2 and later"); |
341 | MODULE_LICENSE("GPL v2"); | 341 | MODULE_LICENSE("GPL v2"); |
342 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
343 | MODULE_ALIAS("platform:" DRIVER_NAME); | 342 | MODULE_ALIAS("platform:" DRIVER_NAME); |
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c index 6d90f7a2ce22..1b5c25a47b87 100644 --- a/drivers/watchdog/indydog.c +++ b/drivers/watchdog/indydog.c | |||
@@ -214,4 +214,3 @@ module_exit(watchdog_exit); | |||
214 | MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>"); | 214 | MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>"); |
215 | MODULE_DESCRIPTION("Hardware Watchdog Device for SGI IP22"); | 215 | MODULE_DESCRIPTION("Hardware Watchdog Device for SGI IP22"); |
216 | MODULE_LICENSE("GPL"); | 216 | MODULE_LICENSE("GPL"); |
217 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/intel_scu_watchdog.c b/drivers/watchdog/intel_scu_watchdog.c index 8ced25613956..e13e65e996aa 100644 --- a/drivers/watchdog/intel_scu_watchdog.c +++ b/drivers/watchdog/intel_scu_watchdog.c | |||
@@ -564,5 +564,4 @@ module_exit(intel_scu_watchdog_exit); | |||
564 | MODULE_AUTHOR("Intel Corporation"); | 564 | MODULE_AUTHOR("Intel Corporation"); |
565 | MODULE_DESCRIPTION("Intel SCU Watchdog Device Driver"); | 565 | MODULE_DESCRIPTION("Intel SCU Watchdog Device Driver"); |
566 | MODULE_LICENSE("GPL"); | 566 | MODULE_LICENSE("GPL"); |
567 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
568 | MODULE_VERSION(WDT_VER); | 567 | MODULE_VERSION(WDT_VER); |
diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c index d964faf1a250..b16013ffacc2 100644 --- a/drivers/watchdog/iop_wdt.c +++ b/drivers/watchdog/iop_wdt.c | |||
@@ -259,4 +259,3 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); | |||
259 | MODULE_AUTHOR("Curt E Bruns <curt.e.bruns@intel.com>"); | 259 | MODULE_AUTHOR("Curt E Bruns <curt.e.bruns@intel.com>"); |
260 | MODULE_DESCRIPTION("iop watchdog timer driver"); | 260 | MODULE_DESCRIPTION("iop watchdog timer driver"); |
261 | MODULE_LICENSE("GPL"); | 261 | MODULE_LICENSE("GPL"); |
262 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c index f4cce6d66a55..41b3979a9d87 100644 --- a/drivers/watchdog/it8712f_wdt.c +++ b/drivers/watchdog/it8712f_wdt.c | |||
@@ -41,7 +41,6 @@ | |||
41 | MODULE_AUTHOR("Jorge Boncompte - DTI2 <jorge@dti2.net>"); | 41 | MODULE_AUTHOR("Jorge Boncompte - DTI2 <jorge@dti2.net>"); |
42 | MODULE_DESCRIPTION("IT8712F Watchdog Driver"); | 42 | MODULE_DESCRIPTION("IT8712F Watchdog Driver"); |
43 | MODULE_LICENSE("GPL"); | 43 | MODULE_LICENSE("GPL"); |
44 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
45 | 44 | ||
46 | static int max_units = 255; | 45 | static int max_units = 255; |
47 | static int margin = 60; /* in seconds */ | 46 | static int margin = 60; /* in seconds */ |
diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c index d3dcc6988b5f..e2bba68ae71e 100644 --- a/drivers/watchdog/it87_wdt.c +++ b/drivers/watchdog/it87_wdt.c | |||
@@ -772,4 +772,3 @@ module_exit(it87_wdt_exit); | |||
772 | MODULE_AUTHOR("Oliver Schuster"); | 772 | MODULE_AUTHOR("Oliver Schuster"); |
773 | MODULE_DESCRIPTION("Hardware Watchdog Device Driver for IT87xx EC-LPC I/O"); | 773 | MODULE_DESCRIPTION("Hardware Watchdog Device Driver for IT87xx EC-LPC I/O"); |
774 | MODULE_LICENSE("GPL"); | 774 | MODULE_LICENSE("GPL"); |
775 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c index 5580b4fff7fe..f20cc53ff719 100644 --- a/drivers/watchdog/ixp4xx_wdt.c +++ b/drivers/watchdog/ixp4xx_wdt.c | |||
@@ -208,5 +208,3 @@ module_param(nowayout, bool, 0); | |||
208 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); | 208 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); |
209 | 209 | ||
210 | MODULE_LICENSE("GPL"); | 210 | MODULE_LICENSE("GPL"); |
211 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
212 | |||
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c index d1afdf684c18..2de486a7eea1 100644 --- a/drivers/watchdog/jz4740_wdt.c +++ b/drivers/watchdog/jz4740_wdt.c | |||
@@ -222,5 +222,4 @@ module_platform_driver(jz4740_wdt_driver); | |||
222 | MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>"); | 222 | MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>"); |
223 | MODULE_DESCRIPTION("jz4740 Watchdog Driver"); | 223 | MODULE_DESCRIPTION("jz4740 Watchdog Driver"); |
224 | MODULE_LICENSE("GPL"); | 224 | MODULE_LICENSE("GPL"); |
225 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
226 | MODULE_ALIAS("platform:jz4740-wdt"); | 225 | MODULE_ALIAS("platform:jz4740-wdt"); |
diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c index 8a8e3eca8aea..a1a3638c579c 100644 --- a/drivers/watchdog/kempld_wdt.c +++ b/drivers/watchdog/kempld_wdt.c | |||
@@ -578,4 +578,3 @@ module_platform_driver(kempld_wdt_driver); | |||
578 | MODULE_DESCRIPTION("KEM PLD Watchdog Driver"); | 578 | MODULE_DESCRIPTION("KEM PLD Watchdog Driver"); |
579 | MODULE_AUTHOR("Michael Brunner <michael.brunner@kontron.com>"); | 579 | MODULE_AUTHOR("Michael Brunner <michael.brunner@kontron.com>"); |
580 | MODULE_LICENSE("GPL"); | 580 | MODULE_LICENSE("GPL"); |
581 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index dce9ecffd44a..40ca5594a336 100644 --- a/drivers/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c | |||
@@ -323,5 +323,4 @@ module_exit(ks8695_wdt_exit); | |||
323 | MODULE_AUTHOR("Andrew Victor"); | 323 | MODULE_AUTHOR("Andrew Victor"); |
324 | MODULE_DESCRIPTION("Watchdog driver for KS8695"); | 324 | MODULE_DESCRIPTION("Watchdog driver for KS8695"); |
325 | MODULE_LICENSE("GPL"); | 325 | MODULE_LICENSE("GPL"); |
326 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
327 | MODULE_ALIAS("platform:ks8695_wdt"); | 326 | MODULE_ALIAS("platform:ks8695_wdt"); |
diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c index 088fd0c9d888..3b3148c764a3 100644 --- a/drivers/watchdog/lantiq_wdt.c +++ b/drivers/watchdog/lantiq_wdt.c | |||
@@ -249,4 +249,3 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); | |||
249 | MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); | 249 | MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); |
250 | MODULE_DESCRIPTION("Lantiq SoC Watchdog"); | 250 | MODULE_DESCRIPTION("Lantiq SoC Watchdog"); |
251 | MODULE_LICENSE("GPL"); | 251 | MODULE_LICENSE("GPL"); |
252 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c index 173494a681e6..da6fa2b68074 100644 --- a/drivers/watchdog/m54xx_wdt.c +++ b/drivers/watchdog/m54xx_wdt.c | |||
@@ -223,4 +223,3 @@ module_param(nowayout, bool, 0); | |||
223 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); | 223 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); |
224 | 224 | ||
225 | MODULE_LICENSE("GPL"); | 225 | MODULE_LICENSE("GPL"); |
226 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c index bf84f788e592..9826b59ef734 100644 --- a/drivers/watchdog/machzwd.c +++ b/drivers/watchdog/machzwd.c | |||
@@ -92,7 +92,6 @@ static unsigned short zf_readw(unsigned char port) | |||
92 | MODULE_AUTHOR("Fernando Fuganti <fuganti@conectiva.com.br>"); | 92 | MODULE_AUTHOR("Fernando Fuganti <fuganti@conectiva.com.br>"); |
93 | MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver"); | 93 | MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver"); |
94 | MODULE_LICENSE("GPL"); | 94 | MODULE_LICENSE("GPL"); |
95 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
96 | 95 | ||
97 | static bool nowayout = WATCHDOG_NOWAYOUT; | 96 | static bool nowayout = WATCHDOG_NOWAYOUT; |
98 | module_param(nowayout, bool, 0); | 97 | module_param(nowayout, bool, 0); |
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c index cc9d328086ed..6d4f3998e1f6 100644 --- a/drivers/watchdog/max63xx_wdt.c +++ b/drivers/watchdog/max63xx_wdt.c | |||
@@ -258,4 +258,3 @@ MODULE_PARM_DESC(nodelay, | |||
258 | "(max6373/74 only, default=0)"); | 258 | "(max6373/74 only, default=0)"); |
259 | 259 | ||
260 | MODULE_LICENSE("GPL"); | 260 | MODULE_LICENSE("GPL"); |
261 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c index 97d62ee50341..be86ea359eee 100644 --- a/drivers/watchdog/mixcomwd.c +++ b/drivers/watchdog/mixcomwd.c | |||
@@ -315,4 +315,3 @@ MODULE_AUTHOR("Gergely Madarasz <gorgo@itc.hu>"); | |||
315 | MODULE_DESCRIPTION("MixCom Watchdog driver"); | 315 | MODULE_DESCRIPTION("MixCom Watchdog driver"); |
316 | MODULE_VERSION(VERSION); | 316 | MODULE_VERSION(VERSION); |
317 | MODULE_LICENSE("GPL"); | 317 | MODULE_LICENSE("GPL"); |
318 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index d0ebebae607c..d82152077fd9 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||
@@ -330,4 +330,3 @@ MODULE_AUTHOR("Dave Updegraff, Kumar Gala"); | |||
330 | MODULE_DESCRIPTION("Driver for watchdog timer in MPC8xx/MPC83xx/MPC86xx " | 330 | MODULE_DESCRIPTION("Driver for watchdog timer in MPC8xx/MPC83xx/MPC86xx " |
331 | "uProcessors"); | 331 | "uProcessors"); |
332 | MODULE_LICENSE("GPL"); | 332 | MODULE_LICENSE("GPL"); |
333 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index b4341110ad4f..edb31ffd7927 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c | |||
@@ -257,5 +257,4 @@ module_platform_driver(mtx1_wdt_driver); | |||
257 | MODULE_AUTHOR("Michael Stickel, Florian Fainelli"); | 257 | MODULE_AUTHOR("Michael Stickel, Florian Fainelli"); |
258 | MODULE_DESCRIPTION("Driver for the MTX-1 watchdog"); | 258 | MODULE_DESCRIPTION("Driver for the MTX-1 watchdog"); |
259 | MODULE_LICENSE("GPL"); | 259 | MODULE_LICENSE("GPL"); |
260 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
261 | MODULE_ALIAS("platform:mtx1-wdt"); | 260 | MODULE_ALIAS("platform:mtx1-wdt"); |
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c index 2f2ff19da6e2..f9fa58409396 100644 --- a/drivers/watchdog/mv64x60_wdt.c +++ b/drivers/watchdog/mv64x60_wdt.c | |||
@@ -323,5 +323,4 @@ module_exit(mv64x60_wdt_exit); | |||
323 | MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); | 323 | MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); |
324 | MODULE_DESCRIPTION("MV64x60 watchdog driver"); | 324 | MODULE_DESCRIPTION("MV64x60 watchdog driver"); |
325 | MODULE_LICENSE("GPL"); | 325 | MODULE_LICENSE("GPL"); |
326 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
327 | MODULE_ALIAS("platform:" MV64x60_WDT_NAME); | 326 | MODULE_ALIAS("platform:" MV64x60_WDT_NAME); |
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c index b15b6efd91a1..a0d893b0930e 100644 --- a/drivers/watchdog/nuc900_wdt.c +++ b/drivers/watchdog/nuc900_wdt.c | |||
@@ -307,5 +307,4 @@ module_platform_driver(nuc900wdt_driver); | |||
307 | MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>"); | 307 | MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>"); |
308 | MODULE_DESCRIPTION("Watchdog driver for NUC900"); | 308 | MODULE_DESCRIPTION("Watchdog driver for NUC900"); |
309 | MODULE_LICENSE("GPL"); | 309 | MODULE_LICENSE("GPL"); |
310 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
311 | MODULE_ALIAS("platform:nuc900-wdt"); | 310 | MODULE_ALIAS("platform:nuc900-wdt"); |
diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c index 59cf19eeea07..231e5b9d5c8e 100644 --- a/drivers/watchdog/nv_tco.c +++ b/drivers/watchdog/nv_tco.c | |||
@@ -513,4 +513,3 @@ module_exit(nv_tco_cleanup_module); | |||
513 | MODULE_AUTHOR("Mike Waychison"); | 513 | MODULE_AUTHOR("Mike Waychison"); |
514 | MODULE_DESCRIPTION("TCO timer driver for NV chipsets"); | 514 | MODULE_DESCRIPTION("TCO timer driver for NV chipsets"); |
515 | MODULE_LICENSE("GPL"); | 515 | MODULE_LICENSE("GPL"); |
516 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index 4dd281f2c33f..fb57103c8ebc 100644 --- a/drivers/watchdog/of_xilinx_wdt.c +++ b/drivers/watchdog/of_xilinx_wdt.c | |||
@@ -405,4 +405,3 @@ module_platform_driver(xwdt_driver); | |||
405 | MODULE_AUTHOR("Alejandro Cabrera <aldaya@gmail.com>"); | 405 | MODULE_AUTHOR("Alejandro Cabrera <aldaya@gmail.com>"); |
406 | MODULE_DESCRIPTION("Xilinx Watchdog driver"); | 406 | MODULE_DESCRIPTION("Xilinx Watchdog driver"); |
407 | MODULE_LICENSE("GPL v2"); | 407 | MODULE_LICENSE("GPL v2"); |
408 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 34adb540d02c..44edca66d564 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c | |||
@@ -225,4 +225,3 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" | |||
225 | 225 | ||
226 | MODULE_LICENSE("GPL"); | 226 | MODULE_LICENSE("GPL"); |
227 | MODULE_ALIAS("platform:orion_wdt"); | 227 | MODULE_ALIAS("platform:orion_wdt"); |
228 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c index 5afb89b48650..5211d56b3681 100644 --- a/drivers/watchdog/pc87413_wdt.c +++ b/drivers/watchdog/pc87413_wdt.c | |||
@@ -580,8 +580,6 @@ MODULE_AUTHOR("Sven Anders <anders@anduras.de>, " | |||
580 | MODULE_DESCRIPTION("PC87413 WDT driver"); | 580 | MODULE_DESCRIPTION("PC87413 WDT driver"); |
581 | MODULE_LICENSE("GPL"); | 581 | MODULE_LICENSE("GPL"); |
582 | 582 | ||
583 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
584 | |||
585 | module_param(io, int, 0); | 583 | module_param(io, int, 0); |
586 | MODULE_PARM_DESC(io, MODNAME " I/O port (default: " | 584 | MODULE_PARM_DESC(io, MODNAME " I/O port (default: " |
587 | __MODULE_STRING(IO_DEFAULT) ")."); | 585 | __MODULE_STRING(IO_DEFAULT) ")."); |
diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c index 33e49a7f889f..e936f15dc7c7 100644 --- a/drivers/watchdog/pcwd.c +++ b/drivers/watchdog/pcwd.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #include <linux/delay.h> /* For mdelay function */ | 61 | #include <linux/delay.h> /* For mdelay function */ |
62 | #include <linux/timer.h> /* For timer related operations */ | 62 | #include <linux/timer.h> /* For timer related operations */ |
63 | #include <linux/jiffies.h> /* For jiffies stuff */ | 63 | #include <linux/jiffies.h> /* For jiffies stuff */ |
64 | #include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */ | 64 | #include <linux/miscdevice.h> /* For struct miscdevice */ |
65 | #include <linux/watchdog.h> /* For the watchdog specific items */ | 65 | #include <linux/watchdog.h> /* For the watchdog specific items */ |
66 | #include <linux/reboot.h> /* For kernel_power_off() */ | 66 | #include <linux/reboot.h> /* For kernel_power_off() */ |
67 | #include <linux/init.h> /* For __init/__exit/... */ | 67 | #include <linux/init.h> /* For __init/__exit/... */ |
@@ -1011,5 +1011,3 @@ MODULE_AUTHOR("Ken Hollis <kenji@bitgate.com>, " | |||
1011 | MODULE_DESCRIPTION("Berkshire ISA-PC Watchdog driver"); | 1011 | MODULE_DESCRIPTION("Berkshire ISA-PC Watchdog driver"); |
1012 | MODULE_VERSION(WATCHDOG_VERSION); | 1012 | MODULE_VERSION(WATCHDOG_VERSION); |
1013 | MODULE_LICENSE("GPL"); | 1013 | MODULE_LICENSE("GPL"); |
1014 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
1015 | MODULE_ALIAS_MISCDEV(TEMP_MINOR); | ||
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c index 7890f84edf76..b4864f254b48 100644 --- a/drivers/watchdog/pcwd_pci.c +++ b/drivers/watchdog/pcwd_pci.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <linux/errno.h> /* For the -ENODEV/... values */ | 40 | #include <linux/errno.h> /* For the -ENODEV/... values */ |
41 | #include <linux/kernel.h> /* For printk/panic/... */ | 41 | #include <linux/kernel.h> /* For printk/panic/... */ |
42 | #include <linux/delay.h> /* For mdelay function */ | 42 | #include <linux/delay.h> /* For mdelay function */ |
43 | #include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */ | 43 | #include <linux/miscdevice.h> /* For struct miscdevice */ |
44 | #include <linux/watchdog.h> /* For the watchdog specific items */ | 44 | #include <linux/watchdog.h> /* For the watchdog specific items */ |
45 | #include <linux/notifier.h> /* For notifier support */ | 45 | #include <linux/notifier.h> /* For notifier support */ |
46 | #include <linux/reboot.h> /* For reboot_notifier stuff */ | 46 | #include <linux/reboot.h> /* For reboot_notifier stuff */ |
@@ -820,5 +820,3 @@ module_pci_driver(pcipcwd_driver); | |||
820 | MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>"); | 820 | MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>"); |
821 | MODULE_DESCRIPTION("Berkshire PCI-PC Watchdog driver"); | 821 | MODULE_DESCRIPTION("Berkshire PCI-PC Watchdog driver"); |
822 | MODULE_LICENSE("GPL"); | 822 | MODULE_LICENSE("GPL"); |
823 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
824 | MODULE_ALIAS_MISCDEV(TEMP_MINOR); | ||
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c index 115a0ebebf4a..53598e832a2a 100644 --- a/drivers/watchdog/pcwd_usb.c +++ b/drivers/watchdog/pcwd_usb.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <linux/errno.h> /* For the -ENODEV/... values */ | 32 | #include <linux/errno.h> /* For the -ENODEV/... values */ |
33 | #include <linux/kernel.h> /* For printk/panic/... */ | 33 | #include <linux/kernel.h> /* For printk/panic/... */ |
34 | #include <linux/delay.h> /* For mdelay function */ | 34 | #include <linux/delay.h> /* For mdelay function */ |
35 | #include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */ | 35 | #include <linux/miscdevice.h> /* For struct miscdevice */ |
36 | #include <linux/watchdog.h> /* For the watchdog specific items */ | 36 | #include <linux/watchdog.h> /* For the watchdog specific items */ |
37 | #include <linux/notifier.h> /* For notifier support */ | 37 | #include <linux/notifier.h> /* For notifier support */ |
38 | #include <linux/reboot.h> /* For reboot_notifier stuff */ | 38 | #include <linux/reboot.h> /* For reboot_notifier stuff */ |
@@ -72,8 +72,6 @@ do { \ | |||
72 | MODULE_AUTHOR(DRIVER_AUTHOR); | 72 | MODULE_AUTHOR(DRIVER_AUTHOR); |
73 | MODULE_DESCRIPTION(DRIVER_DESC); | 73 | MODULE_DESCRIPTION(DRIVER_DESC); |
74 | MODULE_LICENSE(DRIVER_LICENSE); | 74 | MODULE_LICENSE(DRIVER_LICENSE); |
75 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
76 | MODULE_ALIAS_MISCDEV(TEMP_MINOR); | ||
77 | 75 | ||
78 | /* Module Parameters */ | 76 | /* Module Parameters */ |
79 | module_param(debug, int, 0); | 77 | module_param(debug, int, 0); |
diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c index 329bc60ad7a2..0cdfee266690 100644 --- a/drivers/watchdog/pika_wdt.c +++ b/drivers/watchdog/pika_wdt.c | |||
@@ -299,5 +299,3 @@ module_exit(pikawdt_exit); | |||
299 | MODULE_AUTHOR("Sean MacLennan <smaclennan@pikatech.com>"); | 299 | MODULE_AUTHOR("Sean MacLennan <smaclennan@pikatech.com>"); |
300 | MODULE_DESCRIPTION("PIKA FPGA based Watchdog Timer"); | 300 | MODULE_DESCRIPTION("PIKA FPGA based Watchdog Timer"); |
301 | MODULE_LICENSE("GPL"); | 301 | MODULE_LICENSE("GPL"); |
302 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
303 | |||
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index b30bd430f591..1bdcc313e1d9 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c | |||
@@ -233,5 +233,4 @@ MODULE_PARM_DESC(nowayout, | |||
233 | "Set to 1 to keep watchdog running after device release"); | 233 | "Set to 1 to keep watchdog running after device release"); |
234 | 234 | ||
235 | MODULE_LICENSE("GPL"); | 235 | MODULE_LICENSE("GPL"); |
236 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
237 | MODULE_ALIAS("platform:pnx4008-watchdog"); | 236 | MODULE_ALIAS("platform:pnx4008-watchdog"); |
diff --git a/drivers/watchdog/pnx833x_wdt.c b/drivers/watchdog/pnx833x_wdt.c index 1b62a7dfcc95..882fdcb46ad1 100644 --- a/drivers/watchdog/pnx833x_wdt.c +++ b/drivers/watchdog/pnx833x_wdt.c | |||
@@ -278,4 +278,3 @@ module_exit(watchdog_exit); | |||
278 | MODULE_AUTHOR("Daniel Laird/Andre McCurdy"); | 278 | MODULE_AUTHOR("Daniel Laird/Andre McCurdy"); |
279 | MODULE_DESCRIPTION("Hardware Watchdog Device for PNX833x"); | 279 | MODULE_DESCRIPTION("Hardware Watchdog Device for PNX833x"); |
280 | MODULE_LICENSE("GPL"); | 280 | MODULE_LICENSE("GPL"); |
281 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index 9cf6bc7a234f..71e78ef4b736 100644 --- a/drivers/watchdog/rc32434_wdt.c +++ b/drivers/watchdog/rc32434_wdt.c | |||
@@ -25,8 +25,7 @@ | |||
25 | #include <linux/errno.h> /* For the -ENODEV/... values */ | 25 | #include <linux/errno.h> /* For the -ENODEV/... values */ |
26 | #include <linux/kernel.h> /* For printk/panic/... */ | 26 | #include <linux/kernel.h> /* For printk/panic/... */ |
27 | #include <linux/fs.h> /* For file operations */ | 27 | #include <linux/fs.h> /* For file operations */ |
28 | #include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV | 28 | #include <linux/miscdevice.h> /* For struct miscdevice */ |
29 | (WATCHDOG_MINOR) */ | ||
30 | #include <linux/watchdog.h> /* For the watchdog specific items */ | 29 | #include <linux/watchdog.h> /* For the watchdog specific items */ |
31 | #include <linux/init.h> /* For __init/__exit/... */ | 30 | #include <linux/init.h> /* For __init/__exit/... */ |
32 | #include <linux/platform_device.h> /* For platform_driver framework */ | 31 | #include <linux/platform_device.h> /* For platform_driver framework */ |
@@ -329,4 +328,3 @@ MODULE_AUTHOR("Ondrej Zajicek <santiago@crfreenet.org>," | |||
329 | "Florian Fainelli <florian@openwrt.org>"); | 328 | "Florian Fainelli <florian@openwrt.org>"); |
330 | MODULE_DESCRIPTION("Driver for the IDT RC32434 SoC watchdog"); | 329 | MODULE_DESCRIPTION("Driver for the IDT RC32434 SoC watchdog"); |
331 | MODULE_LICENSE("GPL"); | 330 | MODULE_LICENSE("GPL"); |
332 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c index 8d5facd680b1..082d06262959 100644 --- a/drivers/watchdog/rdc321x_wdt.c +++ b/drivers/watchdog/rdc321x_wdt.c | |||
@@ -298,4 +298,3 @@ module_platform_driver(rdc321x_wdt_driver); | |||
298 | MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); | 298 | MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); |
299 | MODULE_DESCRIPTION("RDC321x watchdog driver"); | 299 | MODULE_DESCRIPTION("RDC321x watchdog driver"); |
300 | MODULE_LICENSE("GPL"); | 300 | MODULE_LICENSE("GPL"); |
301 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c index 4d07964aeae3..a9f84919df7f 100644 --- a/drivers/watchdog/rt2880_wdt.c +++ b/drivers/watchdog/rt2880_wdt.c | |||
@@ -205,4 +205,3 @@ module_platform_driver(rt288x_wdt_driver); | |||
205 | MODULE_DESCRIPTION("MediaTek/Ralink RT288x/RT3xxx hardware watchdog driver"); | 205 | MODULE_DESCRIPTION("MediaTek/Ralink RT288x/RT3xxx hardware watchdog driver"); |
206 | MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org"); | 206 | MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org"); |
207 | MODULE_LICENSE("GPL v2"); | 207 | MODULE_LICENSE("GPL v2"); |
208 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 23aad7c6bf5d..7d8fd041ee25 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
31 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
32 | #include <linux/miscdevice.h> /* for MODULE_ALIAS_MISCDEV */ | ||
33 | #include <linux/watchdog.h> | 32 | #include <linux/watchdog.h> |
34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
35 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
@@ -539,5 +538,4 @@ MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>, " | |||
539 | "Dimitry Andric <dimitry.andric@tomtom.com>"); | 538 | "Dimitry Andric <dimitry.andric@tomtom.com>"); |
540 | MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver"); | 539 | MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver"); |
541 | MODULE_LICENSE("GPL"); | 540 | MODULE_LICENSE("GPL"); |
542 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
543 | MODULE_ALIAS("platform:s3c2410-wdt"); | 541 | MODULE_ALIAS("platform:s3c2410-wdt"); |
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index ccd6b29e21bf..e1d39a1e9628 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c | |||
@@ -193,4 +193,3 @@ module_param(margin, int, 0); | |||
193 | MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)"); | 193 | MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)"); |
194 | 194 | ||
195 | MODULE_LICENSE("GPL"); | 195 | MODULE_LICENSE("GPL"); |
196 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c index ea5d84a1fdad..3abae50773b8 100644 --- a/drivers/watchdog/sb_wdog.c +++ b/drivers/watchdog/sb_wdog.c | |||
@@ -341,7 +341,6 @@ MODULE_PARM_DESC(timeout, | |||
341 | "Watchdog timeout in microseconds (max/default 8388607 or 8.3ish secs)"); | 341 | "Watchdog timeout in microseconds (max/default 8388607 or 8.3ish secs)"); |
342 | 342 | ||
343 | MODULE_LICENSE("GPL"); | 343 | MODULE_LICENSE("GPL"); |
344 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
345 | 344 | ||
346 | /* | 345 | /* |
347 | * example code that can be put in a platform code area to utilize the | 346 | * example code that can be put in a platform code area to utilize the |
diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c index 63632ec87c7e..2eef58a0cf05 100644 --- a/drivers/watchdog/sbc60xxwdt.c +++ b/drivers/watchdog/sbc60xxwdt.c | |||
@@ -387,4 +387,3 @@ module_exit(sbc60xxwdt_unload); | |||
387 | MODULE_AUTHOR("Jakob Oestergaard <jakob@unthought.net>"); | 387 | MODULE_AUTHOR("Jakob Oestergaard <jakob@unthought.net>"); |
388 | MODULE_DESCRIPTION("60xx Single Board Computer Watchdog Timer driver"); | 388 | MODULE_DESCRIPTION("60xx Single Board Computer Watchdog Timer driver"); |
389 | MODULE_LICENSE("GPL"); | 389 | MODULE_LICENSE("GPL"); |
390 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c index 719edc8fdeb3..5f268add17ce 100644 --- a/drivers/watchdog/sbc7240_wdt.c +++ b/drivers/watchdog/sbc7240_wdt.c | |||
@@ -309,5 +309,3 @@ MODULE_AUTHOR("Gilles Gigan"); | |||
309 | MODULE_DESCRIPTION("Watchdog device driver for single board" | 309 | MODULE_DESCRIPTION("Watchdog device driver for single board" |
310 | " computers EPIC Nano 7240 from iEi"); | 310 | " computers EPIC Nano 7240 from iEi"); |
311 | MODULE_LICENSE("GPL"); | 311 | MODULE_LICENSE("GPL"); |
312 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
313 | |||
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c index d4781e05f017..da60560ca446 100644 --- a/drivers/watchdog/sbc8360.c +++ b/drivers/watchdog/sbc8360.c | |||
@@ -404,6 +404,5 @@ MODULE_AUTHOR("Ian E. Morgan <imorgan@webcon.ca>"); | |||
404 | MODULE_DESCRIPTION("SBC8360 watchdog driver"); | 404 | MODULE_DESCRIPTION("SBC8360 watchdog driver"); |
405 | MODULE_LICENSE("GPL"); | 405 | MODULE_LICENSE("GPL"); |
406 | MODULE_VERSION("1.01"); | 406 | MODULE_VERSION("1.01"); |
407 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
408 | 407 | ||
409 | /* end of sbc8360.c */ | 408 | /* end of sbc8360.c */ |
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c index 0c3e9f66ef77..a1c502e0d8ec 100644 --- a/drivers/watchdog/sbc_epx_c3.c +++ b/drivers/watchdog/sbc_epx_c3.c | |||
@@ -220,4 +220,3 @@ MODULE_DESCRIPTION("Hardware Watchdog Device for Winsystems EPX-C3 SBC. " | |||
220 | "so only use it if you are *sure* you are running on this specific " | 220 | "so only use it if you are *sure* you are running on this specific " |
221 | "SBC system from Winsystems! It writes to IO ports 0x1ee and 0x1ef!"); | 221 | "SBC system from Winsystems! It writes to IO ports 0x1ee and 0x1ef!"); |
222 | MODULE_LICENSE("GPL"); | 222 | MODULE_LICENSE("GPL"); |
223 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c index 90d5527ca886..a517d8bae757 100644 --- a/drivers/watchdog/sbc_fitpc2_wdt.c +++ b/drivers/watchdog/sbc_fitpc2_wdt.c | |||
@@ -263,5 +263,3 @@ module_param(nowayout, bool, 0); | |||
263 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); | 263 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); |
264 | 264 | ||
265 | MODULE_LICENSE("GPL"); | 265 | MODULE_LICENSE("GPL"); |
266 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
267 | |||
diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c index 3fb83b0c28c2..3b9fff9dcf65 100644 --- a/drivers/watchdog/sc1200wdt.c +++ b/drivers/watchdog/sc1200wdt.c | |||
@@ -476,4 +476,3 @@ MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>"); | |||
476 | MODULE_DESCRIPTION( | 476 | MODULE_DESCRIPTION( |
477 | "Driver for National Semiconductor PC87307/PC97307 watchdog component"); | 477 | "Driver for National Semiconductor PC87307/PC97307 watchdog component"); |
478 | MODULE_LICENSE("GPL"); | 478 | MODULE_LICENSE("GPL"); |
479 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c index 707e027e5002..f353e18b1a82 100644 --- a/drivers/watchdog/sc520_wdt.c +++ b/drivers/watchdog/sc520_wdt.c | |||
@@ -433,4 +433,3 @@ MODULE_AUTHOR("Scott and Bill Jennings"); | |||
433 | MODULE_DESCRIPTION( | 433 | MODULE_DESCRIPTION( |
434 | "Driver for watchdog timer in AMD \"Elan\" SC520 uProcessor"); | 434 | "Driver for watchdog timer in AMD \"Elan\" SC520 uProcessor"); |
435 | MODULE_LICENSE("GPL"); | 435 | MODULE_LICENSE("GPL"); |
436 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c index af7b136b1874..b96127ea3de1 100644 --- a/drivers/watchdog/sch311x_wdt.c +++ b/drivers/watchdog/sch311x_wdt.c | |||
@@ -26,8 +26,7 @@ | |||
26 | #include <linux/types.h> /* For standard types (like size_t) */ | 26 | #include <linux/types.h> /* For standard types (like size_t) */ |
27 | #include <linux/errno.h> /* For the -ENODEV/... values */ | 27 | #include <linux/errno.h> /* For the -ENODEV/... values */ |
28 | #include <linux/kernel.h> /* For printk/... */ | 28 | #include <linux/kernel.h> /* For printk/... */ |
29 | #include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV | 29 | #include <linux/miscdevice.h> /* For struct miscdevice */ |
30 | (WATCHDOG_MINOR) */ | ||
31 | #include <linux/watchdog.h> /* For the watchdog specific items */ | 30 | #include <linux/watchdog.h> /* For the watchdog specific items */ |
32 | #include <linux/init.h> /* For __init/__exit/... */ | 31 | #include <linux/init.h> /* For __init/__exit/... */ |
33 | #include <linux/fs.h> /* For file operations */ | 32 | #include <linux/fs.h> /* For file operations */ |
@@ -545,5 +544,3 @@ module_exit(sch311x_wdt_exit); | |||
545 | MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>"); | 544 | MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>"); |
546 | MODULE_DESCRIPTION("SMSC SCH311x WatchDog Timer Driver"); | 545 | MODULE_DESCRIPTION("SMSC SCH311x WatchDog Timer Driver"); |
547 | MODULE_LICENSE("GPL"); | 546 | MODULE_LICENSE("GPL"); |
548 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
549 | |||
diff --git a/drivers/watchdog/scx200_wdt.c b/drivers/watchdog/scx200_wdt.c index 8ae7c282d465..836377cf9271 100644 --- a/drivers/watchdog/scx200_wdt.c +++ b/drivers/watchdog/scx200_wdt.c | |||
@@ -37,7 +37,6 @@ | |||
37 | MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>"); | 37 | MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>"); |
38 | MODULE_DESCRIPTION("NatSemi SCx200 Watchdog Driver"); | 38 | MODULE_DESCRIPTION("NatSemi SCx200 Watchdog Driver"); |
39 | MODULE_LICENSE("GPL"); | 39 | MODULE_LICENSE("GPL"); |
40 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
41 | 40 | ||
42 | static int margin = 60; /* in seconds */ | 41 | static int margin = 60; /* in seconds */ |
43 | module_param(margin, int, 0); | 42 | module_param(margin, int, 0); |
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c index 5bca79457768..f9b8e06f3558 100644 --- a/drivers/watchdog/shwdt.c +++ b/drivers/watchdog/shwdt.c | |||
@@ -343,7 +343,6 @@ MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>"); | |||
343 | MODULE_DESCRIPTION("SuperH watchdog driver"); | 343 | MODULE_DESCRIPTION("SuperH watchdog driver"); |
344 | MODULE_LICENSE("GPL"); | 344 | MODULE_LICENSE("GPL"); |
345 | MODULE_ALIAS("platform:" DRV_NAME); | 345 | MODULE_ALIAS("platform:" DRV_NAME); |
346 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
347 | 346 | ||
348 | module_param(clock_division_ratio, int, 0); | 347 | module_param(clock_division_ratio, int, 0); |
349 | MODULE_PARM_DESC(clock_division_ratio, | 348 | MODULE_PARM_DESC(clock_division_ratio, |
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c index 6d665f9c1d58..445ea1ad1fa9 100644 --- a/drivers/watchdog/smsc37b787_wdt.c +++ b/drivers/watchdog/smsc37b787_wdt.c | |||
@@ -603,8 +603,6 @@ MODULE_DESCRIPTION("Driver for SMsC 37B787 watchdog component (Version " | |||
603 | VERSION ")"); | 603 | VERSION ")"); |
604 | MODULE_LICENSE("GPL"); | 604 | MODULE_LICENSE("GPL"); |
605 | 605 | ||
606 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
607 | |||
608 | #ifdef SMSC_SUPPORT_MINUTES | 606 | #ifdef SMSC_SUPPORT_MINUTES |
609 | module_param(unit, int, 0); | 607 | module_param(unit, int, 0); |
610 | MODULE_PARM_DESC(unit, | 608 | MODULE_PARM_DESC(unit, |
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c index b68b1e519d53..ef2638fee4a8 100644 --- a/drivers/watchdog/softdog.c +++ b/drivers/watchdog/softdog.c | |||
@@ -207,4 +207,3 @@ module_exit(watchdog_exit); | |||
207 | MODULE_AUTHOR("Alan Cox"); | 207 | MODULE_AUTHOR("Alan Cox"); |
208 | MODULE_DESCRIPTION("Software Watchdog Device Driver"); | 208 | MODULE_DESCRIPTION("Software Watchdog Device Driver"); |
209 | MODULE_LICENSE("GPL"); | 209 | MODULE_LICENSE("GPL"); |
210 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c index 0e9d8c479c35..ce63a1bbf395 100644 --- a/drivers/watchdog/sp5100_tco.c +++ b/drivers/watchdog/sp5100_tco.c | |||
@@ -580,4 +580,3 @@ module_exit(sp5100_tco_cleanup_module); | |||
580 | MODULE_AUTHOR("Priyanka Gupta"); | 580 | MODULE_AUTHOR("Priyanka Gupta"); |
581 | MODULE_DESCRIPTION("TCO timer driver for SP5100/SB800 chipset"); | 581 | MODULE_DESCRIPTION("TCO timer driver for SP5100/SB800 chipset"); |
582 | MODULE_LICENSE("GPL"); | 582 | MODULE_LICENSE("GPL"); |
583 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c index 7bf8c508862b..d667f6b51d35 100644 --- a/drivers/watchdog/stmp3xxx_rtc_wdt.c +++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c | |||
@@ -108,4 +108,3 @@ module_platform_driver(stmp3xxx_wdt_driver); | |||
108 | MODULE_DESCRIPTION("STMP3XXX RTC Watchdog Driver"); | 108 | MODULE_DESCRIPTION("STMP3XXX RTC Watchdog Driver"); |
109 | MODULE_LICENSE("GPL v2"); | 109 | MODULE_LICENSE("GPL v2"); |
110 | MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>"); | 110 | MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>"); |
111 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c index 88f23c5cfddb..0fd0e8ae62a8 100644 --- a/drivers/watchdog/txx9wdt.c +++ b/drivers/watchdog/txx9wdt.c | |||
@@ -176,5 +176,4 @@ module_platform_driver_probe(txx9wdt_driver, txx9wdt_probe); | |||
176 | 176 | ||
177 | MODULE_DESCRIPTION("TXx9 Watchdog Driver"); | 177 | MODULE_DESCRIPTION("TXx9 Watchdog Driver"); |
178 | MODULE_LICENSE("GPL"); | 178 | MODULE_LICENSE("GPL"); |
179 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
180 | MODULE_ALIAS("platform:txx9wdt"); | 179 | MODULE_ALIAS("platform:txx9wdt"); |
diff --git a/drivers/watchdog/ux500_wdt.c b/drivers/watchdog/ux500_wdt.c index d9af93458df3..e029b5768f2c 100644 --- a/drivers/watchdog/ux500_wdt.c +++ b/drivers/watchdog/ux500_wdt.c | |||
@@ -167,5 +167,4 @@ module_platform_driver(ux500_wdt_driver); | |||
167 | MODULE_AUTHOR("Jonas Aaberg <jonas.aberg@stericsson.com>"); | 167 | MODULE_AUTHOR("Jonas Aaberg <jonas.aberg@stericsson.com>"); |
168 | MODULE_DESCRIPTION("Ux500 Watchdog Driver"); | 168 | MODULE_DESCRIPTION("Ux500 Watchdog Driver"); |
169 | MODULE_LICENSE("GPL"); | 169 | MODULE_LICENSE("GPL"); |
170 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
171 | MODULE_ALIAS("platform:ux500_wdt"); | 170 | MODULE_ALIAS("platform:ux500_wdt"); |
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c index 92f1326f0cfc..da6781c12523 100644 --- a/drivers/watchdog/w83627hf_wdt.c +++ b/drivers/watchdog/w83627hf_wdt.c | |||
@@ -396,4 +396,3 @@ module_exit(wdt_exit); | |||
396 | MODULE_LICENSE("GPL"); | 396 | MODULE_LICENSE("GPL"); |
397 | MODULE_AUTHOR("Pádraig Brady <P@draigBrady.com>"); | 397 | MODULE_AUTHOR("Pádraig Brady <P@draigBrady.com>"); |
398 | MODULE_DESCRIPTION("w83627hf/thf WDT driver"); | 398 | MODULE_DESCRIPTION("w83627hf/thf WDT driver"); |
399 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c index cd9f3c1e1af4..aaf2995d37f4 100644 --- a/drivers/watchdog/w83697hf_wdt.c +++ b/drivers/watchdog/w83697hf_wdt.c | |||
@@ -458,4 +458,3 @@ MODULE_LICENSE("GPL"); | |||
458 | MODULE_AUTHOR("Marcus Junker <junker@anduras.de>, " | 458 | MODULE_AUTHOR("Marcus Junker <junker@anduras.de>, " |
459 | "Samuel Tardieu <sam@rfc1149.net>"); | 459 | "Samuel Tardieu <sam@rfc1149.net>"); |
460 | MODULE_DESCRIPTION("w83697hf/hg WDT driver"); | 460 | MODULE_DESCRIPTION("w83697hf/hg WDT driver"); |
461 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/w83697ug_wdt.c b/drivers/watchdog/w83697ug_wdt.c index 274be0bfaf24..ff58cb74671f 100644 --- a/drivers/watchdog/w83697ug_wdt.c +++ b/drivers/watchdog/w83697ug_wdt.c | |||
@@ -395,4 +395,3 @@ module_exit(wdt_exit); | |||
395 | MODULE_LICENSE("GPL"); | 395 | MODULE_LICENSE("GPL"); |
396 | MODULE_AUTHOR("Flemming Frandsen <ff@nrvissing.net>"); | 396 | MODULE_AUTHOR("Flemming Frandsen <ff@nrvissing.net>"); |
397 | MODULE_DESCRIPTION("w83697ug/uf WDT driver"); | 397 | MODULE_DESCRIPTION("w83697ug/uf WDT driver"); |
398 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c index 7874ae06232b..f0483c75ed32 100644 --- a/drivers/watchdog/w83877f_wdt.c +++ b/drivers/watchdog/w83877f_wdt.c | |||
@@ -406,4 +406,3 @@ module_exit(w83877f_wdt_unload); | |||
406 | MODULE_AUTHOR("Scott and Bill Jennings"); | 406 | MODULE_AUTHOR("Scott and Bill Jennings"); |
407 | MODULE_DESCRIPTION("Driver for watchdog timer in w83877f chip"); | 407 | MODULE_DESCRIPTION("Driver for watchdog timer in w83877f chip"); |
408 | MODULE_LICENSE("GPL"); | 408 | MODULE_LICENSE("GPL"); |
409 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c index 5d2c902825c2..91bf55a20024 100644 --- a/drivers/watchdog/w83977f_wdt.c +++ b/drivers/watchdog/w83977f_wdt.c | |||
@@ -527,4 +527,3 @@ module_exit(w83977f_wdt_exit); | |||
527 | MODULE_AUTHOR("Jose Goncalves <jose.goncalves@inov.pt>"); | 527 | MODULE_AUTHOR("Jose Goncalves <jose.goncalves@inov.pt>"); |
528 | MODULE_DESCRIPTION("Driver for watchdog timer in W83977F I/O chip"); | 528 | MODULE_DESCRIPTION("Driver for watchdog timer in W83977F I/O chip"); |
529 | MODULE_LICENSE("GPL"); | 529 | MODULE_LICENSE("GPL"); |
530 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c index 25aba6e00a23..db0da7ea4fd8 100644 --- a/drivers/watchdog/wafer5823wdt.c +++ b/drivers/watchdog/wafer5823wdt.c | |||
@@ -322,6 +322,5 @@ module_exit(wafwdt_exit); | |||
322 | MODULE_AUTHOR("Justin Cormack"); | 322 | MODULE_AUTHOR("Justin Cormack"); |
323 | MODULE_DESCRIPTION("ICP Wafer 5823 Single Board Computer WDT driver"); | 323 | MODULE_DESCRIPTION("ICP Wafer 5823 Single Board Computer WDT driver"); |
324 | MODULE_LICENSE("GPL"); | 324 | MODULE_LICENSE("GPL"); |
325 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
326 | 325 | ||
327 | /* end of wafer5823wdt.c */ | 326 | /* end of wafer5823wdt.c */ |
diff --git a/drivers/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c index 3045debd5411..0240c60d14e3 100644 --- a/drivers/watchdog/wdrtas.c +++ b/drivers/watchdog/wdrtas.c | |||
@@ -48,8 +48,6 @@ | |||
48 | MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>"); | 48 | MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>"); |
49 | MODULE_DESCRIPTION("RTAS watchdog driver"); | 49 | MODULE_DESCRIPTION("RTAS watchdog driver"); |
50 | MODULE_LICENSE("GPL"); | 50 | MODULE_LICENSE("GPL"); |
51 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
52 | MODULE_ALIAS_MISCDEV(TEMP_MINOR); | ||
53 | 51 | ||
54 | static bool wdrtas_nowayout = WATCHDOG_NOWAYOUT; | 52 | static bool wdrtas_nowayout = WATCHDOG_NOWAYOUT; |
55 | static atomic_t wdrtas_miscdev_open = ATOMIC_INIT(0); | 53 | static atomic_t wdrtas_miscdev_open = ATOMIC_INIT(0); |
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c index ee4333c01109..e0206b5b7d89 100644 --- a/drivers/watchdog/wdt.c +++ b/drivers/watchdog/wdt.c | |||
@@ -664,6 +664,4 @@ module_exit(wdt_exit); | |||
664 | 664 | ||
665 | MODULE_AUTHOR("Alan Cox"); | 665 | MODULE_AUTHOR("Alan Cox"); |
666 | MODULE_DESCRIPTION("Driver for ISA ICS watchdog cards (WDT500/501)"); | 666 | MODULE_DESCRIPTION("Driver for ISA ICS watchdog cards (WDT500/501)"); |
667 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
668 | MODULE_ALIAS_MISCDEV(TEMP_MINOR); | ||
669 | MODULE_LICENSE("GPL"); | 667 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c index 5eec74053882..7355ddd0b207 100644 --- a/drivers/watchdog/wdt285.c +++ b/drivers/watchdog/wdt285.c | |||
@@ -224,7 +224,6 @@ static void __exit footbridge_watchdog_exit(void) | |||
224 | MODULE_AUTHOR("Phil Blundell <pb@nexus.co.uk>"); | 224 | MODULE_AUTHOR("Phil Blundell <pb@nexus.co.uk>"); |
225 | MODULE_DESCRIPTION("Footbridge watchdog driver"); | 225 | MODULE_DESCRIPTION("Footbridge watchdog driver"); |
226 | MODULE_LICENSE("GPL"); | 226 | MODULE_LICENSE("GPL"); |
227 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
228 | 227 | ||
229 | module_param(soft_margin, int, 0); | 228 | module_param(soft_margin, int, 0); |
230 | MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); | 229 | MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); |
diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c index 65a402344933..a8e6f87f60c9 100644 --- a/drivers/watchdog/wdt977.c +++ b/drivers/watchdog/wdt977.c | |||
@@ -507,4 +507,3 @@ module_exit(wd977_exit); | |||
507 | MODULE_AUTHOR("Woody Suwalski <woodys@xandros.com>"); | 507 | MODULE_AUTHOR("Woody Suwalski <woodys@xandros.com>"); |
508 | MODULE_DESCRIPTION("W83977AF Watchdog driver"); | 508 | MODULE_DESCRIPTION("W83977AF Watchdog driver"); |
509 | MODULE_LICENSE("GPL"); | 509 | MODULE_LICENSE("GPL"); |
510 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 36a54c0e32dd..ee89ba4dea63 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c | |||
@@ -744,5 +744,3 @@ module_pci_driver(wdtpci_driver); | |||
744 | MODULE_AUTHOR("JP Nollmann, Alan Cox"); | 744 | MODULE_AUTHOR("JP Nollmann, Alan Cox"); |
745 | MODULE_DESCRIPTION("Driver for the ICS PCI-WDT500/501 watchdog cards"); | 745 | MODULE_DESCRIPTION("Driver for the ICS PCI-WDT500/501 watchdog cards"); |
746 | MODULE_LICENSE("GPL"); | 746 | MODULE_LICENSE("GPL"); |
747 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
748 | MODULE_ALIAS_MISCDEV(TEMP_MINOR); | ||
diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c index 92ad33d0cb71..7a42dffd39e5 100644 --- a/drivers/watchdog/xen_wdt.c +++ b/drivers/watchdog/xen_wdt.c | |||
@@ -362,4 +362,3 @@ MODULE_AUTHOR("Jan Beulich <jbeulich@novell.com>"); | |||
362 | MODULE_DESCRIPTION("Xen WatchDog Timer Driver"); | 362 | MODULE_DESCRIPTION("Xen WatchDog Timer Driver"); |
363 | MODULE_VERSION(DRV_VERSION); | 363 | MODULE_VERSION(DRV_VERSION); |
364 | MODULE_LICENSE("GPL"); | 364 | MODULE_LICENSE("GPL"); |
365 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||