vserver 1.9.5.x5

[linux-2.6.git] / drivers / isdn / hardware / eicon / os_bri.c

diff --git a/drivers/isdn/hardware/eicon/os_bri.c b/drivers/isdn/hardware/eicon/os_bri.c
index e8f023d..4cc44a5 100644 (file)
--- a/drivers/isdn/hardware/eicon/os_bri.c
+++ b/drivers/isdn/hardware/eicon/os_bri.c
@@ -78,7 +78,7 @@ int diva_bri_init_card(diva_os_xdi_adapter_t * a)
        word cmd = 0, cmd_org;
        byte Bus, Slot;
        void *hdev;
-       byte *p;
+       byte __iomem *p;
 
        /*
           Set properties
@@ -331,10 +331,11 @@ void diva_os_prepare_maestra_functions(PISDN_ADAPTER IoAdapter)
 static dword diva_bri_get_serial_number(diva_os_xdi_adapter_t * a)
 {
        dword serNo = 0;
-       byte *confIO;
-       word serHi, serLo, *confMem;
+       byte __iomem *confIO;
+       word serHi, serLo;
+       word __iomem *confMem;
 
-       confIO = (byte *) DIVA_OS_MEM_ATTACH_CFG(&a->xdi_adapter);
+       confIO = DIVA_OS_MEM_ATTACH_CFG(&a->xdi_adapter);
        serHi = (word) (inppw(&confIO[0x22]) & 0x0FFF);
        serLo = (word) (inppw(&confIO[0x26]) & 0x0FFF);
        serNo = ((dword) serHi << 16) | (dword) serLo;
@@ -343,7 +344,7 @@ static dword diva_bri_get_serial_number(diva_os_xdi_adapter_t * a)
        if ((serNo == 0) || (serNo == 0xFFFFFFFF)) {
                DBG_FTL(("W: BRI use BAR[0] to get card serial number"))
 
-               confMem = (word *) DIVA_OS_MEM_ATTACH_RAM(&a->xdi_adapter);
+               confMem = (word __iomem *)DIVA_OS_MEM_ATTACH_RAM(&a->xdi_adapter);
                serHi = (word) (READ_WORD(&confMem[0x11]) & 0x0FFF);
                serLo = (word) (READ_WORD(&confMem[0x13]) & 0x0FFF);
                serNo = (((dword) serHi) << 16) | ((dword) serLo);
@@ -513,9 +514,9 @@ diva_bri_cmd_card_proc(struct _diva_os_xdi_adapter *a,
 
 static int diva_bri_reset_adapter(PISDN_ADAPTER IoAdapter)
 {
-       byte *addrHi, *addrLo, *ioaddr;
+       byte __iomem *addrHi, *addrLo, *ioaddr;
        dword i;
-       byte *Port;
+       byte __iomem *Port;
 
        if (!IoAdapter->port) {
                return (-1);
@@ -602,8 +603,8 @@ static int
 diva_bri_write_sdram_block(PISDN_ADAPTER IoAdapter,
                           dword address, const byte * data, dword length)
 {
-       byte *addrHi, *addrLo, *ioaddr;
-       byte *Port;
+       byte __iomem *addrHi, *addrLo, *ioaddr;
+       byte __iomem *Port;
 
        if (!IoAdapter->port) {
                return (-1);
@@ -630,9 +631,9 @@ static int
 diva_bri_start_adapter(PISDN_ADAPTER IoAdapter,
                       dword start_address, dword features)
 {
-       byte *Port;
+       byte __iomem *Port;
        dword i, test;
-       byte *addrHi, *addrLo, *ioaddr;
+       byte __iomem *addrHi, *addrLo, *ioaddr;
        int started = 0;
        ADAPTER *a = &IoAdapter->a;