hwmon: Deprecate the fscher and fscpos drivers

Now that the new merged fschmd driver has gained support for the watchdog
integrated into these IC's, there is no more reason to keep the old fscher
and fscpos drivers around, so mark them as deprecated.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2193be5..5ddbe35 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -318,6 +318,14 @@ Who:       Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
 
+What:  fscher and fscpos drivers
+When:  June 2009
+Why:   Deprecated by the new fschmd driver.
+Who:   Hans de Goede <hdegoede@redhat.com>
+       Jean Delvare <khali@linux-fr.org>
+
+---------------------------
+
 What:  SELinux "compat_net" functionality
 When:  2.6.30 at the earliest
 Why:   In 2.6.18 the Secmark concept was introduced to replace the "compat_net"

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9197514..3c34fb5 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -305,9 +305,13 @@ config SENSORS_F75375S
          will be called f75375s.
 
 config SENSORS_FSCHER
-       tristate "FSC Hermes"
+       tristate "FSC Hermes (DEPRECATED)"
        depends on X86 && I2C
        help
+         This driver is DEPRECATED please use the new merged fschmd
+         ("FSC Poseidon, Scylla, Hermes, Heimdall and Heracles") driver
+         instead.
+
          If you say yes here you get support for Fujitsu Siemens
          Computers Hermes sensor chips.
 
@@ -315,9 +319,13 @@ config SENSORS_FSCHER
          will be called fscher.
 
 config SENSORS_FSCPOS
-       tristate "FSC Poseidon"
+       tristate "FSC Poseidon (DEPRECATED)"
        depends on X86 && I2C
        help
+         This driver is DEPRECATED please use the new merged fschmd
+         ("FSC Poseidon, Scylla, Hermes, Heimdall and Heracles") driver
+         instead.
+
          If you say yes here you get support for Fujitsu Siemens
          Computers Poseidon sensor chips.
 
@@ -326,15 +334,15 @@ config SENSORS_FSCPOS
 
 config SENSORS_FSCHMD
        tristate "FSC Poseidon, Scylla, Hermes, Heimdall and Heracles"
-       depends on X86 && I2C && EXPERIMENTAL
+       depends on X86 && I2C
        help
          If you say yes here you get support for various Fujitsu Siemens
          Computers sensor chips, including support for the integrated
          watchdog.
 
-         This is a new merged driver for FSC sensor chips which is intended
-         as a replacement for the fscpos, fscscy and fscher drivers and adds
-         support for several other FCS sensor chips.
+         This is a merged driver for FSC sensor chips replacing the fscpos,
+         fscscy and fscher drivers and adding support for several other FSC
+         sensor chips.
 
          This driver can also be built as a module.  If so, the module
          will be called fschmd.