Merge branch 'topic/usb-mixer-cache' into next/usb-audio

[linux-2.6-omap-h63xx.git] / drivers / uio / uio_cif.c

diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
index 838bae4608318857df5ac5500fe9e69dd7b30f24..c60b8fcf0e3e484043afdcb94d872002431e7d0d 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,