IB/hfi1: Remove unused function hfi1_mmu_rb_search

[deliverable/linux.git] / drivers / watchdog / f71808e_wdt.c

diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
index f650e89d8becc406e9c71cf7a39bcd587aa26ff3..d4ba262da7ba2221741758d1378160c1dbe7a958 100644 (file)
--- a/drivers/watchdog/f71808e_wdt.c
+++ b/drivers/watchdog/f71808e_wdt.c
@@ -38,7 +38,7 @@
 
 #define SIO_F71808FG_LD_WDT    0x07    /* Watchdog timer logical device */
 #define SIO_UNLOCK_KEY         0x87    /* Key to enable Super-I/O */
-#define SIO_LOCK_KEY           0xAA    /* Key to diasble Super-I/O */
+#define SIO_LOCK_KEY           0xAA    /* Key to disable Super-I/O */
 
 #define SIO_REG_LDSEL          0x07    /* Logical device select */
 #define SIO_REG_DEVID          0x20    /* Device ID (2 bytes) */
@@ -67,7 +67,7 @@
 
 #define F71808FG_FLAG_WDOUT_EN         7
 
-#define F71808FG_FLAG_WDTMOUT_STS      5
+#define F71808FG_FLAG_WDTMOUT_STS      6
 #define F71808FG_FLAG_WD_EN            5
 #define F71808FG_FLAG_WD_PULSE         4
 #define F71808FG_FLAG_WD_UNIT          3
@@ -670,7 +670,7 @@ static int __init watchdog_init(int sioaddr)
        superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT);
 
        wdt_conf = superio_inb(sioaddr, F71808FG_REG_WDT_CONF);
-       watchdog.caused_reboot = wdt_conf & F71808FG_FLAG_WDTMOUT_STS;
+       watchdog.caused_reboot = wdt_conf & BIT(F71808FG_FLAG_WDTMOUT_STS);
 
        superio_exit(sioaddr);