Commit 3bd19078 authored by Linus Torvalds's avatar Linus Torvalds
parents 3e0777b8 3e90928d
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/dma-mapping.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -1582,9 +1583,9 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1582,9 +1583,9 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_out; goto err_out;
#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */ #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) { if (!rc) {
rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL); rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
if (rc) { if (rc) {
printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n", printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n",
pci_name(pdev)); pci_name(pdev));
...@@ -1593,7 +1594,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1593,7 +1594,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
pci_dac = 1; pci_dac = 1;
} else { } else {
#endif #endif
rc = pci_set_dma_mask(pdev, 0xffffffffULL); rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) { if (rc) {
printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n", printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n",
pci_name(pdev)); pci_name(pdev));
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
...@@ -3391,10 +3392,10 @@ static int __devinit via_init_one (struct pci_dev *pdev, const struct pci_device ...@@ -3391,10 +3392,10 @@ static int __devinit via_init_one (struct pci_dev *pdev, const struct pci_device
if (rc) if (rc)
goto err_out_disable; goto err_out_disable;
rc = pci_set_dma_mask(pdev, 0xffffffffULL); rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) if (rc)
goto err_out_res; goto err_out_res;
rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL); rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) if (rc)
goto err_out_res; goto err_out_res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment