diff options
author | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2012-07-04 18:07:02 +0200 |
---|---|---|
committer | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2012-07-04 18:07:02 +0200 |
commit | 9cf24e3beeb087bd98950d4bbf038e7019c25890 (patch) | |
tree | 7f76741d012917b636a5b59160bb9356c7423987 /driver/base.c | |
parent | befb48615d5c4b90f56e52ed436fe32bea9f11a3 (diff) | |
parent | 0c0934bc67cf32458f80c0ebf2c416c3e6d4e9e7 (diff) | |
download | pcitool-9cf24e3beeb087bd98950d4bbf038e7019c25890.tar.gz pcitool-9cf24e3beeb087bd98950d4bbf038e7019c25890.tar.bz2 pcitool-9cf24e3beeb087bd98950d4bbf038e7019c25890.tar.xz pcitool-9cf24e3beeb087bd98950d4bbf038e7019c25890.zip |
merge gcc-verification and update to linux-3.2
Diffstat (limited to 'driver/base.c')
-rw-r--r-- | driver/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/driver/base.c b/driver/base.c index 8215660..58eb825 100644 --- a/driver/base.c +++ b/driver/base.c @@ -325,7 +325,7 @@ static int __devinit pcidriver_probe(struct pci_dev *pdev, const struct pci_devi if ((id->vendor == PCIE_XILINX_VENDOR_ID)&&(id->device == PCIE_IPECAMERA_DEVICE_ID)) { pci_set_master(pdev); - err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (err < 0) { printk(KERN_ERR "pci_set_dma_mask failed\n"); goto probe_dma_fail; |