Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / drivers / watchdog / f71808e_wdt.c

diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
index 7e5c266..65e5796 100644 (file)
--- a/drivers/watchdog/f71808e_wdt.c
+++ b/drivers/watchdog/f71808e_wdt.c
@@ -308,6 +308,12 @@ static int watchdog_start(void)
                superio_set_bit(watchdog.sioaddr, 0x29, 1);
                break;
 
+       case f71889fg:
+               /* set pin 40 to WDTRST# */
+               superio_outb(watchdog.sioaddr, 0x2b,
+                               superio_inb(watchdog.sioaddr, 0x2b) & 0xcf);
+               break;
+
        default:
                /*
                 * 'default' label to shut up the compiler and catch
@@ -708,8 +714,10 @@ static int __init f71808e_find(int sioaddr)
        case SIO_F71882_ID:
                watchdog.type = f71882fg;
                break;
-       case SIO_F71862_ID:
        case SIO_F71889_ID:
+               watchdog.type = f71889fg;
+               break;
+       case SIO_F71862_ID:
                /* These have a watchdog, though it isn't implemented (yet). */
                err = -ENOSYS;
                goto exit;