Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [PATCH] Switch all my contributions stuff to a single common address [WATCHDOG] pci: use pci_ioremap_bar() in drivers/watchdog
This commit is contained in:
commit
814b3bed63
|
@ -3,8 +3,8 @@
|
|||
*
|
||||
* Based on wdt.c. Original copyright messages:
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
@ -15,7 +15,7 @@
|
|||
* warranty for any of this software. This material is provided
|
||||
* "AS-IS" and at no charge.
|
||||
*
|
||||
* (c) Copyright 1995 Alan Cox <alan@redhat.com>
|
||||
* (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*
|
||||
* 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
|
||||
* Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
* Based on acquirewdt.c which is based on wdt.c.
|
||||
* Original copyright messages:
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
@ -18,7 +18,7 @@
|
|||
* warranty for any of this software. This material is provided
|
||||
* "AS-IS" and at no charge.
|
||||
*
|
||||
* (c) Copyright 1995 Alan Cox <alan@redhat.com>
|
||||
* (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*
|
||||
* 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
|
||||
* Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* Originally based on softdog.c
|
||||
* Copyright 2006-2007 Analog Devices Inc.
|
||||
* Copyright 2006-2007 Michele d'Amico
|
||||
* Copyright 1996 Alan Cox <alan@redhat.com>
|
||||
* Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*
|
||||
* Enter bugs at http://blackfin.uclinux.org/
|
||||
*
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
* Based on wdt.c.
|
||||
* Original copyright messages:
|
||||
*
|
||||
* (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -394,8 +394,7 @@ static unsigned char __init esb_getdevice(void)
|
|||
goto err_disable;
|
||||
}
|
||||
|
||||
BASEADDR = ioremap(pci_resource_start(esb_pci, 0),
|
||||
pci_resource_len(esb_pci, 0));
|
||||
BASEADDR = pci_ioremap_bar(esb_pci, 0);
|
||||
if (BASEADDR == NULL) {
|
||||
/* Something's wrong here, BASEADDR has to be set */
|
||||
printk(KERN_ERR PFX "failed to get BASEADDR\n");
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
* Based on acquirewdt.c which is based on wdt.c.
|
||||
* Original copyright messages:
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
@ -23,7 +23,7 @@
|
|||
* warranty for any of this software. This material is provided
|
||||
* "AS-IS" and at no charge.
|
||||
*
|
||||
* (c) Copyright 1995 Alan Cox <alan@redhat.com>
|
||||
* (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*
|
||||
* 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
|
||||
* Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* based on softdog.c by Alan Cox <alan@redhat.com>
|
||||
* based on softdog.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
* (c) Copyright 2004 ARM Limited
|
||||
*
|
||||
* Based on the SoftDog driver:
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* 20030527: George G. Davis <gdavis@mvista.com>
|
||||
* Initially based on linux-2.4.19-rmk7-pxa1/drivers/char/sa1100_wdt.c
|
||||
* (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
|
||||
* Based on SoftDog driver by Alan Cox <alan@redhat.com>
|
||||
* Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*
|
||||
* Copyright (c) 2004 Texas Instruments.
|
||||
* 1. Modified to support OMAP1610 32-KHz watchdog timer
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
* Based on source code of the following authors:
|
||||
* Ken Hollis <kenji@bitgate.com>,
|
||||
* Lindsay Harris <lindsay@bluegum.com>,
|
||||
* Alan Cox <alan@redhat.com>,
|
||||
* Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* Matt Domsch <Matt_Domsch@dell.com>,
|
||||
* Rob Radez <rob@osinvestor.com>
|
||||
*
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
*
|
||||
* Based on source code of the following authors:
|
||||
* Ken Hollis <kenji@bitgate.com>,
|
||||
* Alan Cox <alan@redhat.com>,
|
||||
* Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* Matt Domsch <Matt_Domsch@dell.com>,
|
||||
* Rob Radez <rob@osinvestor.com>,
|
||||
* Greg Kroah-Hartman <greg@kroah.com>
|
||||
|
|
|
@ -7,7 +7,8 @@
|
|||
* based on
|
||||
* SoftDog 0.05: A Software Watchdog Device
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
* S3C2410 Watchdog Timer Support
|
||||
*
|
||||
* Based on, softdog.c by Alan Cox,
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*
|
||||
* 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
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Watchdog driver for the SA11x0/PXA2xx
|
||||
*
|
||||
* (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
|
||||
* Based on SoftDog driver by Alan Cox <alan@redhat.com>
|
||||
* Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -35,8 +35,8 @@
|
|||
* Based on various other watchdog drivers, which are probably all
|
||||
* loosely based on something Alan Cox wrote years ago.
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
* Based on acquirewdt.c which is based on wdt.c.
|
||||
* Original copyright messages:
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
@ -28,7 +28,7 @@
|
|||
* warranty for any of this software. This material is provided
|
||||
* "AS-IS" and at no charge.
|
||||
*
|
||||
* (c) Copyright 1995 Alan Cox <alan@redhat.com>
|
||||
* (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*
|
||||
* 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
|
||||
* Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* based on softdog.c by Alan Cox <alan@redhat.com>
|
||||
* based on softdog.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x
|
||||
*
|
||||
* Based on acquirewdt.c by Alan Cox <alan@redhat.com>
|
||||
* Based on acquirewdt.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
* and some other existing drivers
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
/*
|
||||
* SoftDog 0.07: A Software Watchdog Device
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
*
|
||||
* (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
@ -23,7 +23,7 @@
|
|||
* warranty for any of this software. This material is provided
|
||||
* "AS-IS" and at no charge.
|
||||
*
|
||||
* (c) Copyright 1995 Alan Cox <alan@redhat.com>
|
||||
* (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
*
|
||||
* (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
* Based on advantechwdt.c which is based on wdt.c.
|
||||
* Original copyright messages:
|
||||
*
|
||||
* (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* Industrial Computer Source WDT500/501 driver
|
||||
*
|
||||
* (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
*
|
||||
* SoftDog 0.05: A Software Watchdog Device
|
||||
*
|
||||
* (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* Industrial Computer Source PCI-WDT500/501 driver
|
||||
*
|
||||
* (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
|
||||
* http://www.redhat.com
|
||||
* (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
Loading…
Reference in New Issue