diff --git a/[refs] b/[refs]
index b917c0876725..83cabab9704f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea102d0ec475e4cd6e74a8b61b45708fbf6b582e
+refs/heads/master: e894d1d7fd8cfa89a085df2d368a5e652751b0a1
diff --git a/trunk/drivers/firewire/nosy.c b/trunk/drivers/firewire/nosy.c
index 763626b739d1..a7c4422a688e 100644
--- a/trunk/drivers/firewire/nosy.c
+++ b/trunk/drivers/firewire/nosy.c
@@ -36,7 +36,7 @@
 #include <linux/timex.h>
 #include <linux/uaccess.h>
 #include <linux/wait.h>
-
+#include <linux/dma-mapping.h>
 #include <linux/atomic.h>
 #include <asm/byteorder.h>
 
@@ -536,7 +536,7 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
 	u32 p, end;
 	int ret, i;
 
-	if (pci_set_dma_mask(dev, 0xffffffff)) {
+	if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) {
 		dev_err(&dev->dev,
 		    "DMA address limits not supported for PCILynx hardware\n");
 		return -ENXIO;