iwmc3200wifi: Coex table command does not expect a response

[safe/jmp/linux-2.6] / drivers / uio / uio_cif.c

diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
index 838bae4..28034c8 100644 (file)
--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
@@ -15,10 +15,6 @@
 
 #include <asm/io.h>
 
-#ifndef PCI_DEVICE_ID_PLX_9030
-#define PCI_DEVICE_ID_PLX_9030 0x9030
-#endif
-
 #define PLX9030_INTCSR         0x4C
 #define INTSCR_INT1_ENABLE     0x01
 #define INTSCR_INT1_STATUS     0x04
@@ -61,8 +57,7 @@ static int __devinit hilscher_pci_probe(struct pci_dev *dev,
        info->mem[0].addr = pci_resource_start(dev, 0);
        if (!info->mem[0].addr)
                goto out_release;
-       info->mem[0].internal_addr = ioremap(pci_resource_start(dev, 0),
-                                            pci_resource_len(dev, 0));
+       info->mem[0].internal_addr = pci_ioremap_bar(dev, 0);
        if (!info->mem[0].internal_addr)
                goto out_release;
 
@@ -116,7 +111,7 @@ static void hilscher_pci_remove(struct pci_dev *dev)
        kfree (info);
 }
 
-static struct pci_device_id hilscher_pci_ids[] = {
+static struct pci_device_id hilscher_pci_ids[] __devinitdata = {
        {
                .vendor =       PCI_VENDOR_ID_PLX,
                .device =       PCI_DEVICE_ID_PLX_9030,
@@ -152,5 +147,6 @@ static void __exit hilscher_exit_module(void)
 module_init(hilscher_init_module);
 module_exit(hilscher_exit_module);
 
+MODULE_DEVICE_TABLE(pci, hilscher_pci_ids);
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Hans J. Koch, Benedikt Spranger");