| To: | Jeff Garzik <jgarzik@xxxxxxxxx> |
|---|---|
| Subject: | [patch 4/6] char/shwdt remove duplicate msecs_to_jiffies() |
| From: | maximilian attems <janitor@xxxxxxxxxxxxxx> |
| Date: | Sun, 31 Oct 2004 15:45:03 +0100 |
| Cc: | Margit Schubert-While <margitsw@xxxxxxxxxxx>, Nishanth Aravamudan <nacc@xxxxxxxxxx>, hvr@xxxxxxx, mcgrof@xxxxxxxxxxxxxxxxxxxx, kernel-janitors@xxxxxxxxxxxxxx, netdev@xxxxxxxxxxx, Domen Puncer <domen@xxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx |
| In-reply-to: | <41841886.2080609@pobox.com> |
| Mail-followup-to: | Jeff Garzik <jgarzik@xxxxxxxxx>, Margit Schubert-While <margitsw@xxxxxxxxxxx>, Nishanth Aravamudan <nacc@xxxxxxxxxx>, hvr@xxxxxxx, mcgrof@xxxxxxxxxxxxxxxxxxxx, kernel-janitors@xxxxxxxxxxxxxx, netdev@xxxxxxxxxxx, Domen Puncer <domen@xxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx |
| References: | <20040923221303.GB13244@us.ibm.com> <20040923221303.GB13244@us.ibm.com> <5.1.0.14.2.20040924074745.00b1cd40@pop.t-online.de> <415CD9D9.2000607@pobox.com> <20041030222228.GB1456@stro.at> <41841886.2080609@pobox.com> |
| Sender: | netdev-bounce@xxxxxxxxxxx |
| User-agent: | Mutt/1.5.6+20040722i |
remove duplicate msecs_to_jiffies() definition.
add include <delay.h>.
Signed-off-by: Maximilian Attems <janitor@xxxxxxxxxxxxxx>
---
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;
_
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [patch 3/6] sx8 remove duplicate definition msleep(), msecs_to_jiffies(), maximilian attems |
|---|---|
| Next by Date: | [patch 6/6] libata remove msleep_libata(), maximilian attems |
| Previous by Thread: | [patch 3/6] sx8 remove duplicate definition msleep(), msecs_to_jiffies(), maximilian attems |
| Next by Thread: | [patch 6/6] libata remove msleep_libata(), maximilian attems |
| Indexes: | [Date] [Thread] [Top] [All Lists] |