On Sat, 2005-08-13 at 15:21 -0700, Linus Torvalds wrote:
> Doesn't seem to be serious enough to be worth it at this late stage in the 
> 2.6.13 game. Can you re-send after I do a release?

Resending as requested:

Here's a patch for unifying the watchdog device node name
to /dev/watchdog as expected by most user-space applications.

Please CC: me on replies as I am not subscribed to LKML.


Signed-off-by: Henrik Brix Andersen <[EMAIL PROTECTED]>


diff -Nurp linux-2.6.13/drivers/char/watchdog/ixp2000_wdt.c 
linux-2.6.13-watchdog/drivers/char/watchdog/ixp2000_wdt.c
--- linux-2.6.13/drivers/char/watchdog/ixp2000_wdt.c    2005-08-29 
01:41:01.000000000 +0200
+++ linux-2.6.13-watchdog/drivers/char/watchdog/ixp2000_wdt.c   2005-08-29 
12:28:31.000000000 +0200
@@ -182,7 +182,7 @@ static struct file_operations ixp2000_wd
 static struct miscdevice ixp2000_wdt_miscdev =
 {
        .minor          = WATCHDOG_MINOR,
-       .name           = "IXP2000 Watchdog",
+       .name           = "watchdog",
        .fops           = &ixp2000_wdt_fops,
 };
 
diff -Nurp linux-2.6.13/drivers/char/watchdog/ixp4xx_wdt.c 
linux-2.6.13-watchdog/drivers/char/watchdog/ixp4xx_wdt.c
--- linux-2.6.13/drivers/char/watchdog/ixp4xx_wdt.c     2005-08-29 
01:41:01.000000000 +0200
+++ linux-2.6.13-watchdog/drivers/char/watchdog/ixp4xx_wdt.c    2005-08-29 
12:28:31.000000000 +0200
@@ -176,7 +176,7 @@ static struct file_operations ixp4xx_wdt
 static struct miscdevice ixp4xx_wdt_miscdev =
 {
        .minor          = WATCHDOG_MINOR,
-       .name           = "IXP4xx Watchdog",
+       .name           = "watchdog",
        .fops           = &ixp4xx_wdt_fops,
 };
 
diff -Nurp linux-2.6.13/drivers/char/watchdog/scx200_wdt.c 
linux-2.6.13-watchdog/drivers/char/watchdog/scx200_wdt.c
--- linux-2.6.13/drivers/char/watchdog/scx200_wdt.c     2005-08-29 
01:41:01.000000000 +0200
+++ linux-2.6.13-watchdog/drivers/char/watchdog/scx200_wdt.c    2005-08-29 
12:28:31.000000000 +0200
@@ -206,7 +206,7 @@ static struct file_operations scx200_wdt
 
 static struct miscdevice scx200_wdt_miscdev = {
        .minor = WATCHDOG_MINOR,
-       .name  = NAME,
+       .name  = "watchdog",
        .fops  = &scx200_wdt_fops,
 };
 


-- 
Henrik Brix Andersen <[EMAIL PROTECTED]>
Gentoo Metadistribution | Mobile computing herd

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to