Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3730
b: refs/heads/master
c: cac8c81
h: refs/heads/master
v: v3
  • Loading branch information
Tobias Klauser authored and Jeff Garzik committed Jun 28, 2005
1 parent dabb9cf commit 9234744
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5f13e7ec5c1d98f4a63a3a79e66b2b121051f5ac
refs/heads/master: cac8c81a59bd3b6815871b3172e8ccf15a3431e0
8 changes: 4 additions & 4 deletions trunk/drivers/net/amd8111e.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 9234744

Please sign in to comment.