diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/watchdog/smsc37b787_wdt.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/watchdog/smsc37b787_wdt.c')
| -rw-r--r-- | drivers/watchdog/smsc37b787_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c index 8a1f0bc3e271..e97b0499bd0d 100644 --- a/drivers/watchdog/smsc37b787_wdt.c +++ b/drivers/watchdog/smsc37b787_wdt.c | |||
| @@ -191,7 +191,7 @@ static inline void wdt_timer_conf(unsigned char conf) | |||
| 191 | static inline void wdt_timer_ctrl(unsigned char reg) | 191 | static inline void wdt_timer_ctrl(unsigned char reg) |
| 192 | { | 192 | { |
| 193 | /* -- Watchdog timer control -- | 193 | /* -- Watchdog timer control -- |
| 194 | * Bit 0 Status Bit: 0 = Timer counting, 1 = Timeout occured | 194 | * Bit 0 Status Bit: 0 = Timer counting, 1 = Timeout occurred |
| 195 | * Bit 1 Power LED Toggle: 0 = Disable Toggle, 1 = Toggle at 1 Hz | 195 | * Bit 1 Power LED Toggle: 0 = Disable Toggle, 1 = Toggle at 1 Hz |
| 196 | * Bit 2 Force Timeout: 1 = Forces WD timeout event (self-cleaning) | 196 | * Bit 2 Force Timeout: 1 = Forces WD timeout event (self-cleaning) |
| 197 | * Bit 3 P20 Force Timeout enabled: | 197 | * Bit 3 P20 Force Timeout enabled: |
| @@ -434,11 +434,11 @@ static long wb_smsc_wdt_ioctl(struct file *file, | |||
| 434 | } uarg; | 434 | } uarg; |
| 435 | 435 | ||
| 436 | static const struct watchdog_info ident = { | 436 | static const struct watchdog_info ident = { |
| 437 | .options = WDIOF_KEEPALIVEPING | | 437 | .options = WDIOF_KEEPALIVEPING | |
| 438 | WDIOF_SETTIMEOUT | | 438 | WDIOF_SETTIMEOUT | |
| 439 | WDIOF_MAGICCLOSE, | 439 | WDIOF_MAGICCLOSE, |
| 440 | .firmware_version = 0, | 440 | .firmware_version = 0, |
| 441 | .identity = "SMsC 37B787 Watchdog", | 441 | .identity = "SMsC 37B787 Watchdog", |
| 442 | }; | 442 | }; |
| 443 | 443 | ||
| 444 | uarg.i = (int __user *)arg; | 444 | uarg.i = (int __user *)arg; |