diff options
Diffstat (limited to 'drivers/rtc/rtc-m41t80.c')
| -rw-r--r-- | drivers/rtc/rtc-m41t80.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c index 0a19c06019be..24bc1689fc74 100644 --- a/drivers/rtc/rtc-m41t80.c +++ b/drivers/rtc/rtc-m41t80.c | |||
| @@ -13,21 +13,21 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/bcd.h> |
| 17 | #include <linux/i2c.h> | ||
| 17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 18 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/module.h> | ||
| 21 | #include <linux/rtc.h> | ||
| 19 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 20 | #include <linux/smp_lock.h> | 23 | #include <linux/smp_lock.h> |
| 21 | #include <linux/string.h> | 24 | #include <linux/string.h> |
| 22 | #include <linux/i2c.h> | ||
| 23 | #include <linux/rtc.h> | ||
| 24 | #include <linux/bcd.h> | ||
| 25 | #ifdef CONFIG_RTC_DRV_M41T80_WDT | 25 | #ifdef CONFIG_RTC_DRV_M41T80_WDT |
| 26 | #include <linux/miscdevice.h> | ||
| 27 | #include <linux/watchdog.h> | ||
| 28 | #include <linux/reboot.h> | ||
| 29 | #include <linux/fs.h> | 26 | #include <linux/fs.h> |
| 30 | #include <linux/ioctl.h> | 27 | #include <linux/ioctl.h> |
| 28 | #include <linux/miscdevice.h> | ||
| 29 | #include <linux/reboot.h> | ||
| 30 | #include <linux/watchdog.h> | ||
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | #define M41T80_REG_SSEC 0 | 33 | #define M41T80_REG_SSEC 0 |
| @@ -631,14 +631,12 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
| 631 | return -EFAULT; | 631 | return -EFAULT; |
| 632 | 632 | ||
| 633 | if (rv & WDIOS_DISABLECARD) { | 633 | if (rv & WDIOS_DISABLECARD) { |
| 634 | printk(KERN_INFO | 634 | pr_info("rtc-m41t80: disable watchdog\n"); |
| 635 | "rtc-m41t80: disable watchdog\n"); | ||
| 636 | wdt_disable(); | 635 | wdt_disable(); |
| 637 | } | 636 | } |
| 638 | 637 | ||
| 639 | if (rv & WDIOS_ENABLECARD) { | 638 | if (rv & WDIOS_ENABLECARD) { |
| 640 | printk(KERN_INFO | 639 | pr_info("rtc-m41t80: enable watchdog\n"); |
| 641 | "rtc-m41t80: enable watchdog\n"); | ||
| 642 | wdt_ping(); | 640 | wdt_ping(); |
| 643 | } | 641 | } |
| 644 | 642 | ||
