Merge branch 'sh/stable-updates' into sh/for-2.6.30

[karo-tx-linux.git] / drivers / uio / uio_cif.c

diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
index 57376060b97858d3afb10fa9f1ab494cf8a8f34f..28034c812914e024b5494fecb818f1a3ddfa315d 100644 (file)
--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
@@ -57,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;
 
@@ -148,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");