Skip to content

Commit

Permalink
[WATCHDOG] gef_wdt: Author corrections following split of GE Fanuc jo…
Browse files Browse the repository at this point in the history
…int 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>
  • Loading branch information
Martyn Welch authored and Wim Van Sebroeck committed Mar 6, 2010
1 parent ec26985 commit cda61c9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/watchdog/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions drivers/watchdog/gef_wdt.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
}

Expand All @@ -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");

0 comments on commit cda61c9

Please sign in to comment.