diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /arch/sparc/kernel/iommu.c | |
| parent | 69266866a5790080d7fe80094b28d670ff8aa765 (diff) | |
| parent | 3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'arch/sparc/kernel/iommu.c')
| -rw-r--r-- | arch/sparc/kernel/iommu.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c index 5fad94950e7..8414549c183 100644 --- a/arch/sparc/kernel/iommu.c +++ b/arch/sparc/kernel/iommu.c | |||
| @@ -862,13 +862,3 @@ int dma_supported(struct device *dev, u64 device_mask) | |||
| 862 | return 0; | 862 | return 0; |
| 863 | } | 863 | } |
| 864 | EXPORT_SYMBOL(dma_supported); | 864 | EXPORT_SYMBOL(dma_supported); |
| 865 | |||
| 866 | int dma_set_mask(struct device *dev, u64 dma_mask) | ||
| 867 | { | ||
| 868 | #ifdef CONFIG_PCI | ||
| 869 | if (dev->bus == &pci_bus_type) | ||
| 870 | return pci_set_dma_mask(to_pci_dev(dev), dma_mask); | ||
| 871 | #endif | ||
| 872 | return -EINVAL; | ||
| 873 | } | ||
| 874 | EXPORT_SYMBOL(dma_set_mask); | ||