Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux.git] / drivers / misc / mei / wd.c

diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index 3effd5f20bf5f9bc02cd1d32e730e0e37417933d..6251a4ee7067b19a7119b0f47df97700c7beb2b1 100644 (file)
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -318,7 +318,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;