Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / watchdog / m54xx_wdt.c

diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c
index 60ed625..f388a76 100644 (file)
--- a/drivers/watchdog/m54xx_wdt.c
+++ b/drivers/watchdog/m54xx_wdt.c
@@ -155,7 +155,7 @@ static long m54xx_wdt_ioctl(struct file *file, unsigned int cmd,
 
                heartbeat = time;
                wdt_enable();
-               /* Fall through */
+               fallthrough;
 
        case WDIOC_GETTIMEOUT:
                ret = put_user(heartbeat, (int *)arg);