[patch 4/6] char/shwdt remove duplicate msecs_to_jiffies()
From: maximilian attems <hidden>
Date: 2004-10-31 14:48:17
Also in:
kernel-janitors, lkml
remove duplicate msecs_to_jiffies() definition. add include <delay.h>. Signed-off-by: Maximilian Attems <redacted> --- linux-2.4.28-rc1-max/drivers/char/shwdt.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/char/shwdt.c~remove-msecs_to_jiffies-drivers_char_shwdt drivers/char/shwdt.c
--- linux-2.4.28-rc1/drivers/char/shwdt.c~remove-msecs_to_jiffies-drivers_char_shwdt 2004-10-31 13:40:49.000000000 +0100
+++ linux-2.4.28-rc1-max/drivers/char/shwdt.c 2004-10-31 13:42:05.000000000 +0100@@ -27,6 +27,7 @@ #include <linux/reboot.h> #include <linux/notifier.h> #include <linux/ioport.h> +#include <linux/delay.h> #include <asm/io.h> #include <asm/uaccess.h>
@@ -113,7 +114,6 @@ */ static int clock_division_ratio = WTCSR_CKS_4096; -#define msecs_to_jiffies(msecs) (jiffies + (HZ * msecs + 9999) / 10000) #define next_ping_period(cks) msecs_to_jiffies(cks - 4) static unsigned long shwdt_is_open;
_