Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Apr 2010 16:56:40 +0000 (09:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Apr 2010 16:56:40 +0000 (09:56 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] hpwdt - fix lower timeout limit
  [WATCHDOG] iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs
  [WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl.
  [WATCHDOG] doc: watchdog simple example: don't fail on fsync()
  [WATCHDOG] set max63xx driver as ARM only
  [WATCHDOG] powerpc: pika_wdt ident cannot be const

1  2 
drivers/watchdog/hpwdt.c

diff --combined drivers/watchdog/hpwdt.c
index 72f5a3707b48fd81d47701d1869680b9018afd2c,af48075dafb1497ea97fe35275bafc3b0f5050a9..809e7167a6243fa2b1aeb37c6678be21faf3b01c
@@@ -39,6 -39,7 +39,6 @@@
  #include <linux/efi.h>
  #include <linux/string.h>
  #include <linux/bootmem.h>
 -#include <linux/slab.h>
  #include <asm/desc.h>
  #include <asm/cacheflush.h>
  
@@@ -442,7 -443,7 +442,7 @@@ static void hpwdt_ping(void
  static int hpwdt_change_timer(int new_margin)
  {
        /* Arbitrary, can't find the card's limits */
-       if (new_margin < 30 || new_margin > 600) {
+       if (new_margin < 5 || new_margin > 600) {
                printk(KERN_WARNING
                        "hpwdt: New value passed in is invalid: %d seconds.\n",
                        new_margin);