diff options
Diffstat (limited to 'drivers/net/ioc3-eth.c')
| -rw-r--r-- | drivers/net/ioc3-eth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index 9b8295ee06ef..ae71ed57c12d 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/ip.h> | 44 | #include <linux/ip.h> |
| 45 | #include <linux/tcp.h> | 45 | #include <linux/tcp.h> |
| 46 | #include <linux/udp.h> | 46 | #include <linux/udp.h> |
| 47 | #include <linux/dma-mapping.h> | ||
| 47 | 48 | ||
| 48 | #ifdef CONFIG_SERIAL_8250 | 49 | #ifdef CONFIG_SERIAL_8250 |
| 49 | #include <linux/serial_core.h> | 50 | #include <linux/serial_core.h> |
| @@ -1195,17 +1196,17 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1195 | int err, pci_using_dac; | 1196 | int err, pci_using_dac; |
| 1196 | 1197 | ||
| 1197 | /* Configure DMA attributes. */ | 1198 | /* Configure DMA attributes. */ |
| 1198 | err = pci_set_dma_mask(pdev, 0xffffffffffffffffULL); | 1199 | err = pci_set_dma_mask(pdev, DMA_64BIT_MASK); |
| 1199 | if (!err) { | 1200 | if (!err) { |
| 1200 | pci_using_dac = 1; | 1201 | pci_using_dac = 1; |
| 1201 | err = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL); | 1202 | err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); |
| 1202 | if (err < 0) { | 1203 | if (err < 0) { |
| 1203 | printk(KERN_ERR "%s: Unable to obtain 64 bit DMA " | 1204 | printk(KERN_ERR "%s: Unable to obtain 64 bit DMA " |
| 1204 | "for consistent allocations\n", pci_name(pdev)); | 1205 | "for consistent allocations\n", pci_name(pdev)); |
| 1205 | goto out; | 1206 | goto out; |
| 1206 | } | 1207 | } |
| 1207 | } else { | 1208 | } else { |
| 1208 | err = pci_set_dma_mask(pdev, 0xffffffffULL); | 1209 | err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); |
| 1209 | if (err) { | 1210 | if (err) { |
| 1210 | printk(KERN_ERR "%s: No usable DMA configuration, " | 1211 | printk(KERN_ERR "%s: No usable DMA configuration, " |
| 1211 | "aborting.\n", pci_name(pdev)); | 1212 | "aborting.\n", pci_name(pdev)); |
