Merge ../linux-2.6

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 481708d527ae..a4c0b04cfdbd 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -179,6 +179,7 @@
 
 #include <linux/blkdev.h>
 #include <linux/types.h>
+#include <linux/dma-mapping.h>
 
 #include <scsi/sg.h>
 
@@ -7284,10 +7285,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) &&
-            !pci_set_dma_mask(ha->pcidev, 0xffffffffffffffffULL)) {
+            !pci_set_dma_mask(ha->pcidev, DMA_64BIT_MASK)) {
                 (ha)->flags |= IPS_HA_ENH_SG;
         } else {
-                if (pci_set_dma_mask(ha->pcidev, 0xffffffffULL) != 0) {
+                if (pci_set_dma_mask(ha->pcidev, DMA_32BIT_MASK) != 0) {
                         printk(KERN_WARNING "Unable to set DMA Mask\n");
                         return ips_abort_init(ha, index);
                 }