[WATCHDOG] make wdt_pci.c independant of wdt.c

drivers/char/watchdog/Kconfig

@@ -68,6 +68,24 @@ config WDT
 	  say M here and read <file:Documentation/modules.txt>.  The module
 	  will be called wdt.
 
+config WDT_501
+	bool "WDT501 features"
+	depends on WDT
+	help
+	  Saying Y here and creating a character special file /dev/temperature
+	  with major number 10 and minor number 131 ("man mknod") will give
+	  you a thermometer inside your computer: reading from
+	  /dev/temperature yields one byte, the temperature in degrees
+	  Fahrenheit. This works only if you have a WDT501P watchdog board
+	  installed.
+
+config WDT_501_FAN
+	bool "Fan Tachometer"
+	depends on WDT_501
+	help
+	  Enable the Fan Tachometer on the WDT501. Only do this if you have a
+	  fan tachometer actually set up.
+
 config WDTPCI
 	tristate "WDT PCI Watchdog timer"
 	depends on WATCHDOG
@@ -84,9 +102,9 @@ config WDTPCI
 	  say M here and read <file:Documentation/modules.txt>.  The module
 	  will be called wdt_pci.
 
-config WDT_501
-	bool "WDT501 features"
-	depends on WDT
+config WDT_501_PCI
+	bool "WDT501-PCI features"
+	depends on WDTPCI
 	help
 	  Saying Y here and creating a character special file /dev/temperature
 	  with major number 10 and minor number 131 ("man mknod") will give
@@ -95,13 +113,6 @@ config WDT_501
 	  Fahrenheit. This works only if you have a WDT501P watchdog board
 	  installed.
 
-config WDT_501_FAN
-	bool "Fan Tachometer"
-	depends on WDT_501
-	help
-	  Enable the Fan Tachometer on the WDT501. Only do this if you have a
-	  fan tachometer actually set up.
-
 config PCWATCHDOG
 	tristate "Berkshire Products PC Watchdog"
 	depends on WATCHDOG

drivers/char/watchdog/wdt_pci.c

@@ -486,7 +486,7 @@ static struct miscdevice wdtpci_miscdev = {
 	.fops	= &wdtpci_fops,
 };
 
-#ifdef CONFIG_WDT_501
+#ifdef CONFIG_WDT_501_PCI
 static struct miscdevice temp_miscdev = {
 	.minor	= TEMP_MINOR,
 	.name	= "temperature",
@@ -550,7 +550,7 @@ static int __init wdtpci_init_one (struct pci_dev *dev,
 		printk (KERN_ERR PFX "can't misc_register on minor=%d\n", WATCHDOG_MINOR);
 		goto out_misc;
 	}
-#ifdef CONFIG_WDT_501
+#ifdef CONFIG_WDT_501_PCI
 	ret = misc_register (&temp_miscdev);
 	if (ret) {
 		printk (KERN_ERR PFX "can't misc_register (temp) on minor=%d\n", TEMP_MINOR);
@@ -562,7 +562,7 @@ static int __init wdtpci_init_one (struct pci_dev *dev,
 out:
 	return ret;
 
-#ifdef CONFIG_WDT_501
+#ifdef CONFIG_WDT_501_PCI
 out_rbt:
 	unregister_reboot_notifier(&wdtpci_notifier);
 #endif