vserver 1.9.3

[linux-2.6.git] / drivers / pcmcia / cardbus.c

diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 9670049..1b86c6d 100644 (file)
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -85,7 +85,7 @@
     
 =====================================================================*/
 
-static u_int xlate_rom_addr(u_char * b, u_int addr)
+static u_int xlate_rom_addr(void __iomem *b, u_int addr)
 {
        u_int img = 0, ofs = 0, sz;
        u_short data;
@@ -118,7 +118,7 @@ static void cb_release_cis_mem(struct pcmcia_socket * s)
                cs_dbg(s, 1, "cb_release_cis_mem()\n");
                iounmap(s->cb_cis_virt);
                s->cb_cis_virt = NULL;
-               s->cb_cis_res = 0;
+               s->cb_cis_res = NULL;
        }
 }