git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3c59x: Fix build failure with gcc 3.2
[safe/jmp/linux-2.6]
/
drivers
/
net
/
acenic.c
diff --git
a/drivers/net/acenic.c
b/drivers/net/acenic.c
index
06a9f11
..
08419ee
100644
(file)
--- a/
drivers/net/acenic.c
+++ b/
drivers/net/acenic.c
@@
-1161,9
+1161,9
@@
static int __devinit ace_init(struct net_device *dev)
/*
* Configure DMA attributes.
*/
/*
* Configure DMA attributes.
*/
- if (!pci_set_dma_mask(pdev, DMA_
64BIT_MASK
)) {
+ if (!pci_set_dma_mask(pdev, DMA_
BIT_MASK(64)
)) {
ap->pci_using_dac = 1;
ap->pci_using_dac = 1;
- } else if (!pci_set_dma_mask(pdev, DMA_
32BIT_MASK
)) {
+ } else if (!pci_set_dma_mask(pdev, DMA_
BIT_MASK(32)
)) {
ap->pci_using_dac = 0;
} else {
ecode = -ENODEV;
ap->pci_using_dac = 0;
} else {
ecode = -ENODEV;
@@
-2573,7
+2573,6
@@
restart:
netif_wake_queue(dev);
}
netif_wake_queue(dev);
}
- dev->trans_start = jiffies;
return NETDEV_TX_OK;
overflow:
return NETDEV_TX_OK;
overflow: