Merge branch 'x86/oprofile' into oprofile

[~andy/linux] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 01e33e80eac0a2bf86e1541fcca855f6a48ee9d1..db20542796bff39c0361e8985ce5284524390d4f 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -285,10 +285,11 @@ config ALIM1535_WDT
 
 config ALIM7101_WDT
        tristate "ALi M7101 PMU Computer Watchdog"
-       depends on X86 && PCI
+       depends on PCI
        help
          This is the driver for the hardware watchdog on the ALi M7101 PMU
-         as used in the x86 Cobalt servers.
+         as used in the x86 Cobalt servers and also found in some
+         SPARC Netra servers too.
 
          To compile this driver as a module, choose M here: the
          module will be called alim7101_wdt.
@@ -463,7 +464,7 @@ config PC87413_WDT
          module will be called pc87413_wdt.
 
          Most people will say N.
- 
+
 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
        depends on X86
@@ -697,10 +698,11 @@ config 8xx_WDT
 
 config 8xxx_WDT
        tristate "MPC8xxx Platform Watchdog Timer"
-       depends on PPC_83xx || PPC_86xx
+       depends on PPC_8xx || PPC_83xx || PPC_86xx
        help
          This driver is for a SoC level watchdog that exists on some
          Freescale PowerPC processors. So far this driver supports:
+         - MPC8xx watchdogs
          - MPC83xx watchdogs
          - MPC86xx watchdogs