|
@@ -26,6 +26,7 @@
|
|
|
#include <linux/delay.h>
|
|
|
#include <linux/time.h>
|
|
|
#include <linux/hdreg.h>
|
|
|
+#include <linux/dma-mapping.h>
|
|
|
#include <asm/io.h>
|
|
|
#include <asm/semaphore.h>
|
|
|
#include <asm/uaccess.h>
|
|
@@ -1582,9 +1583,9 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
goto err_out;
|
|
|
|
|
|
#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */
|
|
|
- rc = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
|
|
|
+ rc = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
|
|
|
if (!rc) {
|
|
|
- rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
|
|
|
+ rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
|
|
|
if (rc) {
|
|
|
printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n",
|
|
|
pci_name(pdev));
|
|
@@ -1593,7 +1594,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
pci_dac = 1;
|
|
|
} else {
|
|
|
#endif
|
|
|
- rc = pci_set_dma_mask(pdev, 0xffffffffULL);
|
|
|
+ rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
|
|
if (rc) {
|
|
|
printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n",
|
|
|
pci_name(pdev));
|