2 files changed, 9 insertions, 9 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"
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index 734d9806a872..26447bdeac22 100644
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -1,9 +1,9 @@
 /*
- * GE Fanuc watchdog userspace interface
+ * GE watchdog userspace interface
  *
- * Author:  Martyn Welch <martyn.welch@gefanuc.com>
+ * Author:  Martyn Welch <martyn.welch@ge.com>
  *
- * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+ * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -165,7 +165,7 @@ static long gef_wdt_ioctl(struct file *file, unsigned int cmd,
                 .options =      WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE |
                                 WDIOF_KEEPALIVEPING,
                 .firmware_version = 0,
-                .identity = "GE Fanuc watchdog",
+                .identity = "GE watchdog",
         };
 
         switch (cmd) {
@@ -311,7 +311,7 @@ static struct of_platform_driver gef_wdt_driver = {
 
 static int __init gef_wdt_init(void)
 {
-        printk(KERN_INFO "GE Fanuc watchdog driver\n");
+        printk(KERN_INFO "GE watchdog driver\n");
         return of_register_platform_driver(&gef_wdt_driver);
 }
 
@@ -323,8 +323,8 @@ static void __exit gef_wdt_exit(void)
 module_init(gef_wdt_init);
 module_exit(gef_wdt_exit);
 
-MODULE_AUTHOR("Martyn Welch <martyn.welch@gefanuc.com>");
-MODULE_DESCRIPTION("GE Fanuc watchdog driver");
+MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>");
+MODULE_DESCRIPTION("GE watchdog driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform: gef_wdt");