diff options
| author | David S. Miller | 2008-06-17 03:25:48 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-06-17 03:25:48 +0200 |
| commit | caea902f72b053fd0c76d0d3b6b2e057beb3fc64 (patch) | |
| tree | 74e8d476b2c51480420e2ef7c9bbae249b6edbc9 /drivers/net/wireless/rt2x00/rt2x00pci.c | |
| parent | netns: introduce the net_hash_mix "salt" for hashes (diff) | |
| parent | atm: [he] send idle cells instead of unassigned when in SDH mode (diff) | |
| download | kernel-qcow2-linux-caea902f72b053fd0c76d0d3b6b2e057beb3fc64.tar.gz kernel-qcow2-linux-caea902f72b053fd0c76d0d3b6b2e057beb3fc64.tar.xz kernel-qcow2-linux-caea902f72b053fd0c76d0d3b6b2e057beb3fc64.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00usb.c
net/sctp/protocol.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 82e80b69d0be..8d6ad18d3890 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c @@ -357,8 +357,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) if (pci_set_mwi(pci_dev)) ERROR_PROBE("MWI not available.\n"); - if (pci_set_dma_mask(pci_dev, DMA_64BIT_MASK) && - pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { + if (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { ERROR_PROBE("PCI DMA not supported.\n"); retval = -EIO; goto exit_disable_device; |