diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /drivers/watchdog/advantechwdt.c | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/watchdog/advantechwdt.c')
| -rw-r--r-- | drivers/watchdog/advantechwdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c index a5110f93a755..a1d7856ea6e0 100644 --- a/drivers/watchdog/advantechwdt.c +++ b/drivers/watchdog/advantechwdt.c | |||
| @@ -6,8 +6,8 @@ | |||
| 6 | * Based on acquirewdt.c which is based on wdt.c. | 6 | * Based on acquirewdt.c which is based on wdt.c. |
| 7 | * Original copyright messages: | 7 | * Original copyright messages: |
| 8 | * | 8 | * |
| 9 | * (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved. | 9 | * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, |
| 10 | * http://www.redhat.com | 10 | * All Rights Reserved. |
| 11 | * | 11 | * |
| 12 | * This program is free software; you can redistribute it and/or | 12 | * This program is free software; you can redistribute it and/or |
| 13 | * modify it under the terms of the GNU General Public License | 13 | * modify it under the terms of the GNU General Public License |
| @@ -18,7 +18,7 @@ | |||
| 18 | * warranty for any of this software. This material is provided | 18 | * warranty for any of this software. This material is provided |
| 19 | * "AS-IS" and at no charge. | 19 | * "AS-IS" and at no charge. |
| 20 | * | 20 | * |
| 21 | * (c) Copyright 1995 Alan Cox <alan@redhat.com> | 21 | * (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 22 | * | 22 | * |
| 23 | * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> | 23 | * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> |
| 24 | * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT | 24 | * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT |