Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 9fdcd60c5493..49eb0612d5af 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -2021,7 +2021,7 @@ make_local_pdev(adapter_t *adapter, struct pci_dev **pdev)
 
         memcpy(*pdev, adapter->dev, sizeof(struct pci_dev));
 
-        if( pci_set_dma_mask(*pdev, DMA_32BIT_MASK) != 0 ) {
+        if( pci_set_dma_mask(*pdev, DMA_BIT_MASK(32)) != 0 ) {
                 kfree(*pdev);
                 return -1;
         }
@@ -4793,10 +4793,10 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         /* Set the Mode of addressing to 64 bit if we can */
         if ((adapter->flag & BOARD_64BIT) && (sizeof(dma_addr_t) == 8)) {
-                pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+                pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
                 adapter->has_64bit_addr = 1;
         } else  {
-                pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 adapter->has_64bit_addr = 0;
         }