/drivers/net/at1700.c replaced init_module&cleanup_module with module_init&module_exit

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / i82092.c

diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index c2ea07aa7a124968be057da0678a5aeafc85e43d..e54ecc580d9ed328cc887cb843ab58542d5f5b34 100644 (file)
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -82,7 +82,7 @@ struct socket_info {
                                    1 = empty socket, 
                                    2 = card but not initialized,
                                    3 = operational card */
-       kio_addr_t io_base;     /* base io address of the socket */
+       unsigned int io_base;   /* base io address of the socket */
        
        struct pcmcia_socket socket;
        struct pci_dev *dev;    /* The PCI device for the socket */
@@ -161,7 +161,7 @@ static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_de
        pci_set_drvdata(dev, &sockets[i].socket);
 
        for (i = 0; i<socket_count; i++) {
-               sockets[i].socket.dev.dev = &dev->dev;
+               sockets[i].socket.dev.parent = &dev->dev;
                sockets[i].socket.ops = &i82092aa_operations;
                sockets[i].socket.resource_ops = &pccard_nonstatic_ops;
                ret = pcmcia_register_socket(&sockets[i].socket);
@@ -647,7 +647,12 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
        if ( (mem->card_start > 0x3ffffff) || (region.start > region.end) ||
             (mem->speed > 1000) ) {
                leave("i82092aa_set_mem_map: invalid address / speed");
-               printk("invalid mem map for socket %i : %lx to %lx with a start of %x \n",sock,region.start, region.end, mem->card_start);
+               printk("invalid mem map for socket %i: %llx to %llx with a "
+                       "start of %x\n",
+                       sock,
+                       (unsigned long long)region.start,
+                       (unsigned long long)region.end,
+                       mem->card_start);
                return -EINVAL;
        }