diff options
| author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:11 -0400 |
| commit | 284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch) | |
| tree | 06c1b5a0f83c90cfb662f756e7781977ce739ce8 /drivers/net/r6040.c | |
| parent | 6afd142fd0dfba497246d0fab236c20a7b4bf778 (diff) | |
dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/r6040.c')
| -rw-r--r-- | drivers/net/r6040.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 0a37f9902a0..5e8540b6ffa 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
| @@ -1085,13 +1085,13 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, | |||
| 1085 | goto err_out; | 1085 | goto err_out; |
| 1086 | 1086 | ||
| 1087 | /* this should always be supported */ | 1087 | /* this should always be supported */ |
| 1088 | err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 1088 | err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
| 1089 | if (err) { | 1089 | if (err) { |
| 1090 | printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" | 1090 | printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" |
| 1091 | "not supported by the card\n"); | 1091 | "not supported by the card\n"); |
| 1092 | goto err_out; | 1092 | goto err_out; |
| 1093 | } | 1093 | } |
| 1094 | err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); | 1094 | err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); |
| 1095 | if (err) { | 1095 | if (err) { |
| 1096 | printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" | 1096 | printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" |
| 1097 | "not supported by the card\n"); | 1097 | "not supported by the card\n"); |