From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/watchdog/it8712f_wdt.c | 11 ----------- 1 file changed, 11 deletions(-) diff -puN drivers/watchdog/it8712f_wdt.c~git-watchdog-git-rejects drivers/watchdog/it8712f_wdt.c --- a/drivers/watchdog/it8712f_wdt.c~git-watchdog-git-rejects +++ a/drivers/watchdog/it8712f_wdt.c @@ -170,14 +170,9 @@ it8712f_wdt_update_margin(void) superio_outb(config, WDT_CONFIG); if (revision >= 0x08) -<<<<<<< HEAD:drivers/watchdog/it8712f_wdt.c - superio_outb(units >> 8, WDT_TIMEOUT + 1); - superio_outb(units, WDT_TIMEOUT); -======= superio_outw(units, WDT_TIMEOUT); else superio_outb(units, WDT_TIMEOUT); ->>>>>>> FETCH_HEAD:drivers/watchdog/it8712f_wdt.c } static int @@ -296,15 +291,9 @@ it8712f_wdt_ioctl(struct inode *inode, s if (get_user(value, p)) return -EFAULT; if (value < 1) -<<<<<<< HEAD:drivers/watchdog/it8712f_wdt.c return -EINVAL; if (value > (max_units * 60)) return -EINVAL; -======= - return -EINVAL; - if (value > (max_units * 60)) - return -EINVAL; ->>>>>>> FETCH_HEAD:drivers/watchdog/it8712f_wdt.c margin = value; superio_enter(); superio_select(LDN_GPIO); _