diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-22 05:02:09 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-22 05:02:09 +0200 |
| commit | 5bd3ef84d73c2ea7b4babbad060909753c4828d4 (patch) | |
| tree | fdf2bafb48ae1ed03175f6c77a7548a181e69ee9 /sound/pci/pcxhr/pcxhr.c | |
| parent | powerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover (diff) | |
| parent | powerpc: Fix of_node_put() exit path in of_irq_map_one() (diff) | |
| download | linux-5bd3ef84d73c2ea7b4babbad060909753c4828d4.tar.xz linux-5bd3ef84d73c2ea7b4babbad060909753c4828d4.zip | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
Diffstat (limited to 'sound/pci/pcxhr/pcxhr.c')
| -rw-r--r-- | sound/pci/pcxhr/pcxhr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 80e064a3efff..833e9c7b27c7 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c @@ -1449,7 +1449,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, pci_set_master(pci); /* check if we can restrict PCI DMA transfers to 32 bits */ - if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) { + if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) { snd_printk(KERN_ERR "architecture does not support " "32bit PCI busmaster DMA\n"); pci_disable_device(pci); |