diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 09:52:20 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 09:52:20 +0100 |
| commit | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (patch) | |
| tree | 082cf7dd287f61635198011e61c3de1be130cc42 /drivers/net/amd8111e.c | |
| parent | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
| download | kernel_goldelico_gta04-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.zip kernel_goldelico_gta04-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.tar.gz kernel_goldelico_gta04-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.tar.bz2 | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/net/amd8111e.c')
| -rwxr-xr-x | drivers/net/amd8111e.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index b7dd726..8618012 100755 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c @@ -87,6 +87,7 @@ Revision History: #include <linux/if_vlan.h> #include <linux/ctype.h> #include <linux/crc32.h> +#include <linux/dma-mapping.h> #include <asm/system.h> #include <asm/io.h> @@ -2006,12 +2007,11 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, } /* Initialize DMA */ - if(!pci_dma_supported(pdev, 0xffffffff)){ + if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) < 0) { printk(KERN_ERR "amd8111e: DMA not supported," "exiting.\n"); - goto err_free_reg; - } else - pdev->dma_mask = 0xffffffff; + goto err_free_reg; + } reg_addr = pci_resource_start(pdev, 0); reg_len = pci_resource_len(pdev, 0); |