From 96fa05069e3b6ca1b42e1f7d6995a4d86d1772a6 Mon Sep 17 00:00:00 2001
From: Milind Arun Choudhary <milindchoudhary@gmail.com>
Date: Tue, 8 May 2007 00:28:57 -0700
Subject: [PATCH] --- yaml --- r: 54655 b: refs/heads/master c:
 b259d74b39595f6ac74c3627b9c3657ac90249a0 h: refs/heads/master i:   54653:
 616ff36ded044108cdccdaa11cee37403f48f5a8   54651:
 d431ddf5a69ee0148df90191576bfab6575a8830   54647:
 3e9c99d395429f94b124cd2edb5b77f78a852d64   54639:
 b543c73dc8e5eb47319c723afdb5110877217201   54623:
 7968207ee75064fa5df05e5f6955fd830ee7dac0   54591:
 6aa9cac1e1252ca72221fc67f56c4de8d29f9ef7   54527:
 56391923f1790c18ad9ebefb4ee983eb2806c5e1 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/char/lp.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 14a3b5bd14ed..3892a8af0c2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e8638e2ace18eb6b814a63fe087106be05ca267
+refs/heads/master: b259d74b39595f6ac74c3627b9c3657ac90249a0
diff --git a/trunk/drivers/char/lp.c b/trunk/drivers/char/lp.c
index fa626034a6e2..62051f8b0910 100644
--- a/trunk/drivers/char/lp.c
+++ b/trunk/drivers/char/lp.c
@@ -138,9 +138,6 @@
 /* if you have more than 8 printers, remember to increase LP_NO */
 #define LP_NO 8
 
-/* ROUND_UP macro from fs/select.c */
-#define ROUND_UP(x,y) (((x)+(y)-1)/(y))
-
 static struct lp_struct lp_table[LP_NO];
 
 static unsigned int lp_count = 0;
@@ -651,7 +648,7 @@ static int lp_ioctl(struct inode *inode, struct file *file,
 			    (par_timeout.tv_usec < 0)) {
 				return -EINVAL;
 			}
-			to_jiffies = ROUND_UP(par_timeout.tv_usec, 1000000/HZ);
+			to_jiffies = DIV_ROUND_UP(par_timeout.tv_usec, 1000000/HZ);
 			to_jiffies += par_timeout.tv_sec * (long) HZ;
 			if (to_jiffies <= 0) {
 				return -EINVAL;