diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-31 00:38:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-31 00:38:21 +0100 |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /sound/pci/bt87x.c | |
| parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
| download | op-kernel-dev-e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4.zip op-kernel-dev-e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4.tar.gz | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'sound/pci/bt87x.c')
| -rw-r--r-- | sound/pci/bt87x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 3aa8d97..1aa1c04 100644 --- 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; |
