diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/ata/pata_cs5520.c | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/pata_cs5520.c')
| -rw-r--r-- | drivers/ata/pata_cs5520.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c index db6a96984f3f..0df83cf74233 100644 --- a/drivers/ata/pata_cs5520.c +++ b/drivers/ata/pata_cs5520.c | |||
| @@ -203,11 +203,11 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi | |||
| 203 | return -ENODEV; | 203 | return -ENODEV; |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 206 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { |
| 207 | printk(KERN_ERR DRV_NAME ": unable to configure DMA mask.\n"); | 207 | printk(KERN_ERR DRV_NAME ": unable to configure DMA mask.\n"); |
| 208 | return -ENODEV; | 208 | return -ENODEV; |
| 209 | } | 209 | } |
| 210 | if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) { | 210 | if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) { |
| 211 | printk(KERN_ERR DRV_NAME ": unable to configure consistent DMA mask.\n"); | 211 | printk(KERN_ERR DRV_NAME ": unable to configure consistent DMA mask.\n"); |
| 212 | return -ENODEV; | 212 | return -ENODEV; |
| 213 | } | 213 | } |