diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/8139cp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index d639cb8dc461..ca4c9ac7e115 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
@@ -60,6 +60,7 @@ | |||
60 | #include <linux/etherdevice.h> | 60 | #include <linux/etherdevice.h> |
61 | #include <linux/init.h> | 61 | #include <linux/init.h> |
62 | #include <linux/pci.h> | 62 | #include <linux/pci.h> |
63 | #include <linux/dma-mapping.h> | ||
63 | #include <linux/delay.h> | 64 | #include <linux/delay.h> |
64 | #include <linux/ethtool.h> | 65 | #include <linux/ethtool.h> |
65 | #include <linux/mii.h> | 66 | #include <linux/mii.h> |
@@ -1701,19 +1702,19 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1701 | 1702 | ||
1702 | /* Configure DMA attributes. */ | 1703 | /* Configure DMA attributes. */ |
1703 | if ((sizeof(dma_addr_t) > 4) && | 1704 | if ((sizeof(dma_addr_t) > 4) && |
1704 | !pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL) && | 1705 | !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) && |
1705 | !pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) { | 1706 | !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { |
1706 | pci_using_dac = 1; | 1707 | pci_using_dac = 1; |
1707 | } else { | 1708 | } else { |
1708 | pci_using_dac = 0; | 1709 | pci_using_dac = 0; |
1709 | 1710 | ||
1710 | rc = pci_set_dma_mask(pdev, 0xffffffffULL); | 1711 | rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); |
1711 | if (rc) { | 1712 | if (rc) { |
1712 | printk(KERN_ERR PFX "No usable DMA configuration, " | 1713 | printk(KERN_ERR PFX "No usable DMA configuration, " |
1713 | "aborting.\n"); | 1714 | "aborting.\n"); |
1714 | goto err_out_res; | 1715 | goto err_out_res; |
1715 | } | 1716 | } |
1716 | rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL); | 1717 | rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); |
1717 | if (rc) { | 1718 | if (rc) { |
1718 | printk(KERN_ERR PFX "No usable consistent DMA configuration, " | 1719 | printk(KERN_ERR PFX "No usable consistent DMA configuration, " |
1719 | "aborting.\n"); | 1720 | "aborting.\n"); |