git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
via-rhine.c
diff --git
a/drivers/net/via-rhine.c
b/drivers/net/via-rhine.c
index 880eaf07413b0fc33ce99a404d27bf859a60e207..45daba726b665fd753a1338244536595a00099f6 100644
(file)
--- a/
drivers/net/via-rhine.c
+++ b/
drivers/net/via-rhine.c
@@
-686,7
+686,7
@@
static int __devinit rhine_init_one(struct pci_dev *pdev,
goto err_out;
/* this should always be supported */
- rc = pci_set_dma_mask(pdev, DMA_
32BIT_MASK
);
+ rc = pci_set_dma_mask(pdev, DMA_
BIT_MASK(32)
);
if (rc) {
printk(KERN_ERR "32-bit PCI DMA addresses not supported by "
"the card!?\n");