diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
commit | 2231b3729eb92f163bbe64b604410ee451b2c42b (patch) | |
tree | 4b4043cda9bfcf0912839edbb64484763853bd33 /sound/pci/cs5530.c | |
parent | b99053eefce89c5c8500517f5f065c85b57d98ee (diff) | |
parent | e946217e4fdaa67681bbabfa8e6b18641921f750 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'sound/pci/cs5530.c')
-rw-r--r-- | sound/pci/cs5530.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c index 7ff8b68e997..6dea5b5cc77 100644 --- a/sound/pci/cs5530.c +++ b/sound/pci/cs5530.c @@ -2,7 +2,7 @@ * cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio * * (C) Copyright 2007 Ash Willis <ashwillis@programmer.net> - * (C) Copyright 2003 Red Hat Inc <alan@redhat.com> + * (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk> * * This driver was ported (shamelessly ripped ;) from oss/kahlua.c but I did * mess with it a bit. The chip seems to have to have trouble with full duplex @@ -132,7 +132,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card, } chip->pci_base = pci_resource_start(pci, 0); - mem = ioremap_nocache(chip->pci_base, pci_resource_len(pci, 0)); + mem = pci_ioremap_bar(pci, 0); if (mem == NULL) { kfree(chip); pci_disable_device(pci); |