diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 06:08:25 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 08:26:14 +0200 |
commit | d886cb586f60a5ccf156392f96a39bc52db925d0 (patch) | |
tree | 5862de796cf8dfd2f38e30d36cc589a07b5f9d88 /drivers/char/rio/port.h | |
parent | Linux 2.6.17-rc5 (diff) | |
download | linux-d886cb586f60a5ccf156392f96a39bc52db925d0.tar.xz linux-d886cb586f60a5ccf156392f96a39bc52db925d0.zip |
[PATCH] trivial annotations in rio
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/char/rio/port.h')
-rw-r--r-- | drivers/char/rio/port.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/char/rio/port.h b/drivers/char/rio/port.h index 9b5fa3eb0402..49cf6d15ee54 100644 --- a/drivers/char/rio/port.h +++ b/drivers/char/rio/port.h @@ -40,7 +40,7 @@ struct Port { struct gs_port gs; int PortNum; /* RIO port no., 0-511 */ struct Host *HostP; - caddr_t Caddr; + void __iomem *Caddr; unsigned short HostPort; /* Port number on host card */ unsigned char RupNum; /* Number of RUP for port */ unsigned char ID2; /* Second ID of RTA for port */ @@ -92,13 +92,13 @@ struct Port { #define RIO_RTSFLOW 0x0400 /* RIO's own RTSFLOW flag */ - struct PHB *PhbP; /* pointer to PHB for port */ - u16 *TxAdd; /* Add packets here */ - u16 *TxStart; /* Start of add array */ - u16 *TxEnd; /* End of add array */ - u16 *RxRemove; /* Remove packets here */ - u16 *RxStart; /* Start of remove array */ - u16 *RxEnd; /* End of remove array */ + struct PHB __iomem *PhbP; /* pointer to PHB for port */ + u16 __iomem *TxAdd; /* Add packets here */ + u16 __iomem *TxStart; /* Start of add array */ + u16 __iomem *TxEnd; /* End of add array */ + u16 __iomem *RxRemove; /* Remove packets here */ + u16 __iomem *RxStart; /* Start of remove array */ + u16 __iomem *RxEnd; /* End of remove array */ unsigned int RtaUniqueNum; /* Unique number of RTA */ unsigned short PortState; /* status of port */ unsigned short ModemState; /* status of modem lines */ |