Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / sound / pci / bt87x.c

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 3aa8d973540abefb0c55234ec4c84eafe66ece26..1aa1c04025407f2243d11a277f26b2a29da6c740 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -749,8 +749,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
                pci_disable_device(pci);
                return err;
        }
-       chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
-                                    pci_resource_len(pci, 0));
+       chip->mmio = pci_ioremap_bar(pci, 0);
        if (!chip->mmio) {
                snd_printk(KERN_ERR "cannot remap io memory\n");
                err = -ENOMEM;