X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fserial%2Ficom.h;h=798f1ef237128e8e5d3a672247c8b53faab67bcd;hb=a2f44b27303a5353859d77a3e96a1d3f33f56ab7;hp=479b52d3695ce22af8914e36c6c25995aa25c113;hpb=1a69f36a78895dad9a6b97ffa2d6d2b7c3975b5d;p=linux-2.6.git

diff --git a/drivers/serial/icom.h b/drivers/serial/icom.h
index 479b52d36..798f1ef23 100644
--- a/drivers/serial/icom.h
+++ b/drivers/serial/icom.h
@@ -234,9 +234,9 @@ struct icom_port {
 	unsigned char cable_id;
 	unsigned char read_status_mask;
 	unsigned char ignore_status_mask;
-	unsigned long int_reg;
-	struct icom_regs *global_reg;
-	struct func_dram *dram;
+	void __iomem * int_reg;
+	struct icom_regs __iomem *global_reg;
+	struct func_dram __iomem *dram;
 	int port;
 	struct statusArea *statStg;
 	dma_addr_t statStg_pci;
@@ -256,7 +256,7 @@ struct icom_port {
 };
 
 struct icom_adapter {
-	unsigned long base_addr;
+	void __iomem * base_addr;
 	unsigned long base_addr_pci;
 	unsigned char irq_number;
 	struct pci_dev *pci_dev;
@@ -278,13 +278,11 @@ struct icom_adapter {
 extern void iCom_sercons_init(void);
 
 struct lookup_proc_table {
-	u32	*global_control_reg;
+	u32	__iomem *global_control_reg;
 	unsigned long	processor_id;
 };
 
 struct lookup_int_table {
-	u32	*global_int_mask;
+	u32	__iomem *global_int_mask;
 	unsigned long	processor_id;
 };
-
-#define MSECS_TO_JIFFIES(ms) (((ms)*HZ+999)/1000)