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/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 8b17278c4a58..fc1092b835d2 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -2522,8 +2522,8 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
          * various kernel subsystems to support the mechanics required by a
          * fixed-high-32-bit system.
          */
-        if ((pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) ||
-            (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK) != 0)) {
+        if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) ||
+            (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)) != 0)) {
                 dev_err(&pdev->dev, "No usable DMA configuration,aborting\n");
                 goto err_dma;
         }