diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-30 10:47:19 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-30 10:50:06 +0400 |
| commit | 186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch) | |
| tree | 9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /drivers/firewire/nosy.c | |
| parent | 99dd5497e5be4fe4194cad181d45fd6569a930db (diff) | |
| parent | 4bde23f8751f388867766b0a62ed1ef8b7e01561 (diff) | |
| download | linux-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.tar.xz | |
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/firewire/nosy.c')
| -rw-r--r-- | drivers/firewire/nosy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c index 763626b739d1..a7c4422a688e 100644 --- a/drivers/firewire/nosy.c +++ b/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; |