Automerge with /usr/src/ntfs-2.6.git.

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 5cd50fd53c12..1f5655655c40 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -44,6 +44,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
@@ -2989,10 +2990,10 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
          */
         if (pdev->vendor == PCI_VENDOR_ID_SUN &&
             pdev->device == PCI_DEVICE_ID_SUN_GEM &&
-            !pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL)) {
+            !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
                 pci_using_dac = 1;
         } else {
-                err = pci_set_dma_mask(pdev, (u64) 0xffffffff);
+                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (err) {
                         printk(KERN_ERR PFX "No usable DMA configuration, "
                                "aborting.\n");