Messages in this thread Patch in this message | | | Date | Sun, 31 Oct 2004 15:45:03 +0100 | From | maximilian attems <> | Subject | [patch 4/6] char/shwdt remove duplicate msecs_to_jiffies() |
| |
remove duplicate msecs_to_jiffies() definition. add include <delay.h>.
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
---
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; _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |