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

Commit 3f1ae223 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] pcwd.c - fix open_allowed type.
  [WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation
  [WATCHDOG] fix watchdog/wdt285.c compilation
  [WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation
  [WATCHDOG] fix watchdog/shwdt.c compilation
  [WATCHDOG] fix watchdog/txx9wdt.c compilation
  [WATCHDOG] MAINTAINERS: remove ZF MACHZ WATCHDOG entry
  [WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n
parents e2205a15 36cbaa87

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -4683,12 +4683,6 @@ L: linux-wireless@vger.kernel.org 
L:	zd1211-devs@lists.sourceforge.net (subscribers-only)

S:	Maintained



ZF MACHZ WATCHDOG

P:	Fernando Fuganti

M:	fuganti@netbank.com.br

W:	http://cvs.conectiva.com.br/drivers/ZFL-watchdog/

S:	Maintained



ZR36067 VIDEO FOR LINUX DRIVER

P:	Ronald Bultje

M:	rbultje@ronald.bitfreak.net

drivers/watchdog/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -66,7 +66,10 @@ obj-$(CONFIG_IB700_WDT) += ib700wdt.o 
obj-$(CONFIG_IBMASR) += ibmasr.o

obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o

obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o

obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o

obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o

ifeq ($(CONFIG_ITCO_VENDOR_SUPPORT),y)

obj-$(CONFIG_ITCO_WDT) += iTCO_vendor_support.o

endif

obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o

obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o

obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o

drivers/watchdog/at91rm9200_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static struct watchdog_info at91_wdt_info = { 
/*

 * Handle commands from user-space.

 */

static long at91_wdt_ioct(struct file *file,

static long at91_wdt_ioctl(struct file *file,

					unsigned int cmd, unsigned long arg)

{

	void __user *argp = (void __user *)arg;

drivers/watchdog/ixp4xx_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static int nowayout = WATCHDOG_NOWAYOUT; 
static int heartbeat = 60;	/* (secs) Default is 1 minute */

static unsigned long wdt_status;

static unsigned long boot_status;

static spin_lock_t wdt_lock;

static DEFINE_SPINLOCK(wdt_lock);



#define WDT_TICK_RATE (IXP4XX_PERIPHERAL_BUS_CLOCK * 1000000UL)

drivers/watchdog/pcwd.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static const int heartbeat_tbl[] = { 
static int cards_found;



/* internal variables */

static atomic_t open_allowed = ATOMIC_INIT(1);

static unsigned long open_allowed;

static char expect_close;

static int temp_panic;