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
/
wireless
/
prism54
/
islpci_hotplug.c
diff --git
a/drivers/net/wireless/prism54/islpci_hotplug.c
b/drivers/net/wireless/prism54/islpci_hotplug.c
index 9a72b1e3e163bb597a075a11c65e9a66a3958312..30876728d7e6ecd4d7a3b64085f9c44c883f33f0 100644
(file)
--- a/
drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/
drivers/net/wireless/prism54/islpci_hotplug.c
@@
-120,7
+120,7
@@
prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
/* enable PCI DMA */
- if (pci_set_dma_mask(pdev, DMA_
32BIT_MASK
)) {
+ if (pci_set_dma_mask(pdev, DMA_
BIT_MASK(32)
)) {
printk(KERN_ERR "%s: 32-bit PCI DMA not supported", DRV_NAME);
goto do_pci_disable_device;
}