Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363216
b: refs/heads/master
c: 5f1e54e
h: refs/heads/master
v: v3
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Apr 15, 2013
1 parent 2040797 commit 5997e98
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2f093e2aa466d799c0952bfd1c6c68ff5d80fc17
refs/heads/master: 5f1e54e8c12219aa49a8fb3eb1503eefb5294ea3
3 changes: 2 additions & 1 deletion trunk/drivers/misc/mei/wd.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,8 @@ static int mei_wd_ops_ping(struct watchdog_device *wd_dev)
*
* returns 0 if success, negative errno code for failure
*/
static int mei_wd_ops_set_timeout(struct watchdog_device *wd_dev, unsigned int timeout)
static int mei_wd_ops_set_timeout(struct watchdog_device *wd_dev,
unsigned int timeout)
{
struct mei_device *dev;

Expand Down

0 comments on commit 5997e98

Please sign in to comment.