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
/
scsi
/
ips.c
diff --git
a/drivers/scsi/ips.c
b/drivers/scsi/ips.c
index
a4c0b04
..
86c5461
100644
(file)
--- a/
drivers/scsi/ips.c
+++ b/
drivers/scsi/ips.c
@@
-179,7
+179,6
@@
#include <linux/blkdev.h>
#include <linux/types.h>
#include <linux/blkdev.h>
#include <linux/types.h>
-#include <linux/dma-mapping.h>
#include <scsi/sg.h>
#include <scsi/sg.h>
@@
-1147,7
+1146,7
@@
ips_queue(Scsi_Cmnd * SC, void (*done) (Scsi_Cmnd *))
return (0);
}
ha->ioctl_reset = 1; /* This reset request is from an IOCTL */
return (0);
}
ha->ioctl_reset = 1; /* This reset request is from an IOCTL */
-
__
ips_eh_reset(SC);
+ ips_eh_reset(SC);
SC->result = DID_OK << 16;
SC->scsi_done(SC);
return (0);
SC->result = DID_OK << 16;
SC->scsi_done(SC);
return (0);
@@
-7285,10
+7284,10
@@
ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
* are guaranteed to be < 4G.
*/
if (IPS_ENABLE_DMA64 && IPS_HAS_ENH_SGLIST(ha) &&
* are guaranteed to be < 4G.
*/
if (IPS_ENABLE_DMA64 && IPS_HAS_ENH_SGLIST(ha) &&
- !pci_set_dma_mask(ha->pcidev,
DMA_64BIT_MASK
)) {
+ !pci_set_dma_mask(ha->pcidev,
0xffffffffffffffffULL
)) {
(ha)->flags |= IPS_HA_ENH_SG;
} else {
(ha)->flags |= IPS_HA_ENH_SG;
} else {
- if (pci_set_dma_mask(ha->pcidev,
DMA_32BIT_MASK
) != 0) {
+ if (pci_set_dma_mask(ha->pcidev,
0xffffffffULL
) != 0) {
printk(KERN_WARNING "Unable to set DMA Mask\n");
return ips_abort_init(ha, index);
}
printk(KERN_WARNING "Unable to set DMA Mask\n");
return ips_abort_init(ha, index);
}