diff -urN linux-2.1.78+nodiratime+mtrr/drivers/char/acquirewdt.c linux/drivers/char/acquirewdt.c
--- linux-2.1.78+nodiratime+mtrr/drivers/char/acquirewdt.c	Wed Dec 10 04:49:58 1997
+++ linux/drivers/char/acquirewdt.c	Mon Jan 12 17:29:15 1998
@@ -46,7 +46,6 @@
  
 #define WDT_STOP 0x43
 #define WDT_START 0x443
-#define WATCHDOG_MINOR 130
 
 #define WD_TIMO (100*60)		/* 1 minute */
 
@@ -181,7 +180,7 @@
 static struct miscdevice acq_miscdev=
 {
 	WATCHDOG_MINOR,
-	"Acquire WDT",
+	"watchdog",
 	&acq_fops
 };
 
diff -urN linux-2.1.78+nodiratime+mtrr/drivers/char/pcwd.c linux/drivers/char/pcwd.c
--- linux-2.1.78+nodiratime+mtrr/drivers/char/pcwd.c	Tue Dec 23 04:03:50 1997
+++ linux/drivers/char/pcwd.c	Mon Jan 12 17:27:37 1998
@@ -33,6 +33,7 @@
  * 971210       Disable board on initialisation in case board already ticking.
  * 971222       Changed open/close for temperature handling
  *              Michael Meskes <meskes@debian.org>.
+ * 980112       Used minor numbers from include/linux/miscdevice.h
  */
 
 #include <linux/module.h>
@@ -67,10 +68,6 @@
 static int pcwd_ioports[] = { 0x270, 0x350, 0x370, 0x000 };
 
 #define WD_VER                  "1.0 (11/18/96)"
-#define	WD_MINOR		130	/* Minor device number */
-#ifndef	TEMP_MINOR
-#define	TEMP_MINOR		131	/* Uses the same as WDT */
-#endif
 
 /*
  * It should be noted that PCWD_REVISION_B was removed because A and B
@@ -382,7 +379,7 @@
 {
         switch (MINOR(ino->i_rdev))
         {
-                case WD_MINOR:
+                case WATCHDOG_MINOR:
                     if (is_open)
                         return -EBUSY;
                     MOD_INC_USE_COUNT;
@@ -424,7 +421,7 @@
 static int pcwd_close(struct inode *ino, struct file *filep)
 {
 	MOD_DEC_USE_COUNT;
-	if (MINOR(ino->i_rdev)==WD_MINOR)
+	if (MINOR(ino->i_rdev)==WATCHDOG_MINOR)
 	{
 	        is_open = 0;
 #ifndef CONFIG_WATCHDOG_NOWAYOUT
@@ -527,8 +524,8 @@
 };
 
 static struct miscdevice pcwd_miscdev = {
-	WD_MINOR,
-	"pcwatchdog",
+	WATCHDOG_MINOR,
+	"watchdog",
 	&pcwd_fops
 };
 
diff -urN linux-2.1.78+nodiratime+mtrr/drivers/char/softdog.c linux/drivers/char/softdog.c
--- linux-2.1.78+nodiratime+mtrr/drivers/char/softdog.c	Wed Dec 10 04:49:58 1997
+++ linux/drivers/char/softdog.c	Mon Jan 12 17:28:57 1998
@@ -37,7 +37,6 @@
 #include <linux/init.h>
 #include <asm/uaccess.h>
 
-#define WATCHDOG_MINOR	130
 #define TIMER_MARGIN	60		/* (secs) Default is 1 minute */
 
 static int soft_margin = TIMER_MARGIN;	/* in seconds */
@@ -177,7 +176,7 @@
 static struct miscdevice softdog_miscdev=
 {
 	WATCHDOG_MINOR,
-	"softdog",
+	"watchdog",
 	&softdog_fops
 };
 
diff -urN linux-2.1.78+nodiratime+mtrr/drivers/char/wd501p.h linux/drivers/char/wd501p.h
--- linux-2.1.78+nodiratime+mtrr/drivers/char/wd501p.h	Fri Dec 13 01:51:09 1996
+++ linux/drivers/char/wd501p.h	Mon Jan 12 17:26:03 1998
@@ -20,9 +20,6 @@
  */
 
 #include <linux/config.h>
- 
-#define WATCHDOG_MINOR		130	/* Watchdog timer     */
-#define TEMP_MINOR		131	/* Temperature Sensor */
 
 #define WDT_COUNT0		(io+0)
 #define WDT_COUNT1		(io+1)
diff -urN linux-2.1.78+nodiratime+mtrr/drivers/char/wdt.c linux/drivers/char/wdt.c
--- linux-2.1.78+nodiratime+mtrr/drivers/char/wdt.c	Tue Dec 30 05:24:21 1997
+++ linux/drivers/char/wdt.c	Mon Jan 12 17:28:45 1998
@@ -333,7 +333,7 @@
 static struct miscdevice wdt_miscdev=
 {
 	WATCHDOG_MINOR,
-	"wdt",
+	"watchdog",
 	&wdt_fops
 };
 
diff -urN linux-2.1.78+nodiratime+mtrr/include/linux/miscdevice.h linux/include/linux/miscdevice.h
--- linux-2.1.78+nodiratime+mtrr/include/linux/miscdevice.h	Fri Nov 14 01:00:43 1997
+++ linux/include/linux/miscdevice.h	Mon Jan 12 17:26:11 1998
@@ -9,6 +9,8 @@
 #define ATARIMOUSE_MINOR 5
 #define SUN_MOUSE_MINOR 6
 #define PC110PAD_MINOR 9
+#define WATCHDOG_MINOR		130	/* Watchdog timer     */
+#define TEMP_MINOR		131	/* Temperature Sensor */
 #define RTC_MINOR 135
 #define SUN_OPENPROM_MINOR 139
 #define NVRAM_MINOR 144