V4L/DVB: v4l2-dev: remove unnecessary lock around atomic clear_bit

[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 5737606..371f87f 100644 (file)
--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/uio_driver.h>
 
 #include <asm/io.h>
@@ -57,8 +58,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 +148,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");