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

Conflicts:
	drivers/scsi/fcoe/fcoe.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index e3569a0a952d..b1610ea4bb3d 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -492,8 +492,8 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
                 goto err_disable_dev;
         }
 
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) ||
-            pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) ||
+            pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 dev_err(&pdev->dev, "No suitable DMA available\n");
                 goto err_free_reg;
         }