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

Commit 6d03a68e 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: (33 commits)
  [WATCHDOG] remove experimental on iTCO_wdt.c
  [WATCHDOG] Atmel AT91RM9200 rename.
  [WATCHDOG] includes for sample watchdog program.
  [WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warning
  [WATCHDOG] add ich8 support to iTCO_wdt.c (patch 2)
  [WATCHDOG] add ich8 support to iTCO_wdt.c
  [WATCHDOG] ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c
  [WATCHDOG] w83697hf/hg WDT driver - Kconfig patch
  [WATCHDOG] w83697hf/hg WDT driver - autodetect patch
  [WATCHDOG] w83697hf/hg WDT driver - patch 16
  [WATCHDOG] w83697hf/hg WDT driver - patch 15
  [WATCHDOG] w83697hf/hg WDT driver - patch 14
  [WATCHDOG] w83697hf/hg WDT driver - patch 13
  [WATCHDOG] w83697hf/hg WDT driver - patch 12
  [WATCHDOG] w83697hf/hg WDT driver - patch 11
  [WATCHDOG] w83697hf/hg WDT driver - patch 10
  [WATCHDOG] w83697hf/hg WDT driver - patch 9
  [WATCHDOG] w83697hf/hg WDT driver - patch 8
  [WATCHDOG] w83697hf/hg WDT driver - patch 7
  [WATCHDOG] w83697hf/hg WDT driver - patch 6
  ...
parents 0c0e4668 cbf40d3f

Documentation/watchdog/src/watchdog-simple.c

+2 −0
Original line number Original line Diff line number Diff line 
#include <stdio.h>

#include <stdlib.h>

#include <stdlib.h>

#include <unistd.h>

#include <fcntl.h>

#include <fcntl.h>





int main(int argc, const char *argv[]) {

int main(int argc, const char *argv[]) {

arch/arm/configs/at91rm9200dk_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -577,7 +577,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
# Watchdog Device Drivers

# Watchdog Device Drivers

#

#

# CONFIG_SOFT_WATCHDOG is not set

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_AT91_WATCHDOG=y

CONFIG_AT91RM9200_WATCHDOG=y





#

#

# USB-based Watchdog Cards

# USB-based Watchdog Cards

arch/arm/configs/at91rm9200ek_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -558,7 +558,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
# Watchdog Device Drivers

# Watchdog Device Drivers

#

#

# CONFIG_SOFT_WATCHDOG is not set

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_AT91_WATCHDOG=y

CONFIG_AT91RM9200_WATCHDOG=y





#

#

# USB-based Watchdog Cards

# USB-based Watchdog Cards

arch/arm/configs/csb337_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -615,7 +615,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
# Watchdog Device Drivers

# Watchdog Device Drivers

#

#

# CONFIG_SOFT_WATCHDOG is not set

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_AT91_WATCHDOG=y

CONFIG_AT91RM9200_WATCHDOG=y





#

#

# USB-based Watchdog Cards

# USB-based Watchdog Cards

arch/arm/configs/csb637_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -615,7 +615,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
# Watchdog Device Drivers

# Watchdog Device Drivers

#

#

# CONFIG_SOFT_WATCHDOG is not set

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_AT91_WATCHDOG=y

CONFIG_AT91RM9200_WATCHDOG=y





#

#

# USB-based Watchdog Cards

# USB-based Watchdog Cards