diff --git a/[refs] b/[refs] index 6667ebf02927..1caf0f55bf7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c97f97b374fe07bc300dea629cba14612442c26d +refs/heads/master: a4bfde5abd4a0f5498a268dba17ffc91d91964d6 diff --git a/trunk/drivers/serial/icom.h b/trunk/drivers/serial/icom.h index 23dc0f7ddf8b..798f1ef23712 100644 --- a/trunk/drivers/serial/icom.h +++ b/trunk/drivers/serial/icom.h @@ -286,5 +286,3 @@ struct lookup_int_table { u32 __iomem *global_int_mask; unsigned long processor_id; }; - -#define MSECS_TO_JIFFIES(ms) (((ms)*HZ+999)/1000)