diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-14 06:29:07 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-14 06:29:07 +0900 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/net/sc92031.c | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
| download | linux-f499cae1e59d75d5eb24c23d47cf8986e6032c6d.tar.gz linux-f499cae1e59d75d5eb24c23d47cf8986e6032c6d.tar.bz2 linux-f499cae1e59d75d5eb24c23d47cf8986e6032c6d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/sc92031.c')
| -rw-r--r-- | drivers/net/sc92031.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c index c13cbf099b88..18821f217e19 100644 --- a/drivers/net/sc92031.c +++ b/drivers/net/sc92031.c @@ -1427,11 +1427,11 @@ static int __devinit sc92031_probe(struct pci_dev *pdev, pci_set_master(pdev); - err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (unlikely(err < 0)) goto out_set_dma_mask; - err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); if (unlikely(err < 0)) goto out_set_dma_mask; |