From: maximilian attems Date: Sun, 31 Oct 2004 14:45:03 +0000 Subject: [KJ] [patch 4/6] char/shwdt remove duplicate msecs_to_jiffies() Message-Id: <20041031144503.GE28667@stro.at> MIME-Version: 1 Content-Type: multipart/mixed; boundary="===============60950602819483812==" List-Id: 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> In-Reply-To: <41841886.2080609@pobox.com> To: Jeff Garzik Cc: Margit Schubert-While , Nishanth Aravamudan , hvr@gnu.org, mcgrof@studorgs.rutgers.edu, kernel-janitors@lists.osdl.org, netdev@oss.sgi.com, Domen Puncer , linux-kernel@vger.kernel.org --===============60950602819483812== Content-Type: text/plain; charset=us-ascii Content-Disposition: inline remove duplicate msecs_to_jiffies() definition. add include . Signed-off-by: Maximilian Attems --- 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 #include #include +#include #include #include @@ -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; _ --===============60950602819483812== Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ Kernel-janitors mailing list Kernel-janitors@lists.osdl.org http://lists.osdl.org/mailman/listinfo/kernel-janitors --===============60950602819483812==--