Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 814b3bed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e61467e9 29fa0586

drivers/watchdog/acquirewdt.c

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/watchdog/advantechwdt.c

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/watchdog/bfin_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -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/

 *

drivers/watchdog/eurotechwdt.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/watchdog/i6300esb.c

+1 −2
Original line number Diff line number Diff line
@@ -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");