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

Commit 74e8f346 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:
  [WATCHDOG] Add support for 1533 bridge to alim1535_wdt
  [WATCHDOG] Add a 00-INDEX file to Documentation/watchdog/
  [WATCHDOG] Eurotechwdt.c - clean-up comments
parents 7da6cd8b 6e420b7e

Documentation/watchdog/00-INDEX

0 → 100644
+10 −0
Original line number Diff line number Diff line 
00-INDEX

	- this file.

pcwd-watchdog.txt

	- documentation for Berkshire Products PC Watchdog ISA cards.

src/

	- directory holding watchdog related example programs.

watchdog-api.txt

	- description of the Linux Watchdog driver API.

wdt.txt

	- description of the Watchdog Timer Interfaces for Linux.

drivers/char/watchdog/alim1535_wdt.c

+5 −2
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ static int ali_notify_sys(struct notifier_block *this, unsigned long code, void 
 */



static struct pci_device_id ali_pci_tbl[] = {

	{ PCI_VENDOR_ID_AL, 0x1533, PCI_ANY_ID, PCI_ANY_ID,},

	{ PCI_VENDOR_ID_AL, 0x1535, PCI_ANY_ID, PCI_ANY_ID,},

	{ 0, },

};
@@ -329,8 +330,10 @@ static int __init ali_find_watchdog(void) 
	struct pci_dev *pdev;

	u32 wdog;



	/* Check for a 1535 series bridge */

	/* Check for a 1533/1535 series bridge */

	pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1535, NULL);

	if (pdev == NULL)

		pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1533, NULL);

	if (pdev == NULL)

		return -ENODEV;

	pci_dev_put(pdev);

drivers/char/watchdog/eurotechwdt.c

+9 −4
Original line number Diff line number Diff line 
/*

 *	Eurotech CPU-1220/1410 on board WDT driver

 *	Eurotech CPU-1220/1410/1420 on board WDT driver

 *

 *	(c) Copyright 2001 Ascensit <support@ascensit.com>

 *	(c) Copyright 2001 Rodolfo Giometti <giometti@ascensit.com>
@@ -24,6 +24,9 @@ 
 */



/* Changelog:

 *

 * 2001 - Rodolfo Giometti

 *	Initial release

 *

 * 2002/04/25 - Rob Radez

 *	clean up #includes
@@ -33,13 +36,15 @@ 
 *	add WDIOC_GETSTATUS and WDIOC_SETOPTIONS ioctls

 *	add expect_close support

 *

 * 2001 - Rodolfo Giometti

 *	Initial release

 *

 * 2002.05.30 - Joel Becker <joel.becker@oracle.com>

 * 	Added Matt Domsch's nowayout module option.

 */



/*

 *	The eurotech CPU-1220/1410/1420's watchdog is a part

 *	of the on-board SUPER I/O device SMSC FDC 37B782.

 */



#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/moduleparam.h>