summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/Kconfig
diff options
context:
space:
mode:
authorMartyn Welch2010-03-01 18:06:20 +0100
committerWim Van Sebroeck2010-03-06 16:13:04 +0100
commitcda61c9420028ddd251b60f1445c9eed756991c7 (patch)
tree20fecc73d0378891b607ecfb5da117ade67b1e24 /drivers/watchdog/Kconfig
parent[WATCHDOG] iTCO_wdt: clean up probe(), modify err msg (diff)
downloadkernel-qcow2-linux-cda61c9420028ddd251b60f1445c9eed756991c7.tar.gz
kernel-qcow2-linux-cda61c9420028ddd251b60f1445c9eed756991c7.tar.xz
kernel-qcow2-linux-cda61c9420028ddd251b60f1445c9eed756991c7.zip
[WATCHDOG] gef_wdt: Author corrections following split of GE Fanuc joint venture
This patch corrects author and copyright notices following the split-up of the GE Fanuc joint venture. Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r--drivers/watchdog/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 713b1cef37d3..bdcdbd53da89 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -861,10 +861,10 @@ config TXX9_WDT
# POWERPC Architecture
config GEF_WDT
- tristate "GE Fanuc Watchdog Timer"
+ tristate "GE Watchdog Timer"
depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
---help---
- Watchdog timer found in a number of GE Fanuc single board computers.
+ Watchdog timer found in a number of GE single board computers.
config MPC5200_WDT
bool "MPC52xx Watchdog Timer"