android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WATCHDOG] gef_wdt: Author corrections following split of GE Fanuc joint venture

Browse Source 
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>
This commit is contained in:
Martyn Welch 2010-03-01 17:06:20 +00:00 committed by Wim Van Sebroeck
parent ec26985be4
commit cda61c9420
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/watchdog/Kconfig
View File

@ -861,10 +861,10 @@ config TXX9_WDT
# POWERPC Architecture # POWERPC Architecture
config GEF_WDT config GEF_WDT
tristate "GE Fanuc Watchdog Timer" tristate "GE Watchdog Timer"
depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
---help--- ---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 config MPC5200_WDT
bool "MPC52xx Watchdog Timer" bool "MPC52xx Watchdog Timer"

14
drivers/watchdog/gef_wdt.c
View File

@ -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 * 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 * 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 | .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE |
WDIOF_KEEPALIVEPING, WDIOF_KEEPALIVEPING,
.firmware_version = 0, .firmware_version = 0,
.identity = "GE Fanuc watchdog", .identity = "GE watchdog",
}; };
switch (cmd) { switch (cmd) {
@ -311,7 +311,7 @@ static struct of_platform_driver gef_wdt_driver = {
static int __init gef_wdt_init(void) 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); 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_init(gef_wdt_init);
module_exit(gef_wdt_exit); module_exit(gef_wdt_exit);
MODULE_AUTHOR("Martyn Welch <martyn.welch@gefanuc.com>"); MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>");
MODULE_DESCRIPTION("GE Fanuc watchdog driver"); MODULE_DESCRIPTION("GE watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
MODULE_ALIAS("platform: gef_wdt"); MODULE_ALIAS("platform: gef_wdt");