Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24

[~andy/linux] / drivers / serial / icom.h

diff --git a/drivers/serial/icom.h b/drivers/serial/icom.h
index 23dc0f7ddf8bb6712613ba0274374f609e1c4412..e8578d8cd35e8c9b0f428aa4b6467ba01b75e3bf 100644 (file)
--- a/drivers/serial/icom.h
+++ b/drivers/serial/icom.h
@@ -258,7 +258,6 @@ struct icom_port {
 struct icom_adapter {
        void __iomem * base_addr;
        unsigned long base_addr_pci;
-       unsigned char irq_number;
        struct pci_dev *pci_dev;
        struct icom_port port_info[4];
        int index;
@@ -286,5 +285,3 @@ struct lookup_int_table {
        u32     __iomem *global_int_mask;
        unsigned long   processor_id;
 };
-
-#define MSECS_TO_JIFFIES(ms) (((ms)*HZ+999)/1000)