git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
sn
/
ioc3.c
diff --git
a/drivers/sn/ioc3.c
b/drivers/sn/ioc3.c
index
501316b
..
4bd05a0
100644
(file)
--- a/
drivers/sn/ioc3.c
+++ b/
drivers/sn/ioc3.c
@@
-11,7
+11,6
@@
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/delay.h>
@@
-620,9
+619,9
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
pci_set_master(pdev);
#ifdef USE_64BIT_DMA
pci_set_master(pdev);
#ifdef USE_64BIT_DMA
- ret = pci_set_dma_mask(pdev,
DMA_64BIT_MASK
);
+ ret = pci_set_dma_mask(pdev,
0xffffffffffffffffULL
);
if (!ret) {
if (!ret) {
- ret = pci_set_consistent_dma_mask(pdev,
DMA_64BIT_MASK
);
+ ret = pci_set_consistent_dma_mask(pdev,
0xffffffffffffffffULL
);
if (ret < 0) {
printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "
"for consistent allocations\n",
if (ret < 0) {
printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "
"for consistent allocations\n",