diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 09:52:20 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 09:52:20 +0100 |
| commit | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (patch) | |
| tree | 082cf7dd287f61635198011e61c3de1be130cc42 /drivers/net/sk98lin | |
| parent | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
| download | op-kernel-dev-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.zip op-kernel-dev-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.tar.gz | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/net/sk98lin')
| -rw-r--r-- | drivers/net/sk98lin/skge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index 1ccb298..82570ec 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c @@ -112,6 +112,7 @@ #include <linux/moduleparam.h> #include <linux/init.h> #include <linux/proc_fs.h> +#include <linux/dma-mapping.h> #include "h/skdrv1st.h" #include "h/skdrv2nd.h" @@ -4912,8 +4913,8 @@ static int __devinit skge_probe_one(struct pci_dev *pdev, goto out; /* Configure DMA attributes. */ - if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL) && - pci_set_dma_mask(pdev, (u64) 0xffffffff)) + if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) && + pci_set_dma_mask(pdev, DMA_32BIT_MASK)) goto out_disable_device; |
