diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-28 14:23:06 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-28 14:23:06 +1000 |
commit | 2864697cefb6e7596e39aef933b4131f6c9fa9e1 (patch) | |
tree | 2d5ad000593a07e28e506a0a3f581ea242a9ff4b /arch/sparc/kernel/pci.c | |
parent | 3c2ee2d9f41ef43a581b26b677d2b4054ccbd200 (diff) | |
parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) |
Merge commit 'tip/iommu-for-powerpc' into next
Diffstat (limited to 'arch/sparc/kernel/pci.c')
-rw-r--r-- | arch/sparc/kernel/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 57859ad23547..c68648662802 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -1039,7 +1039,7 @@ static void ali_sound_dma_hack(struct pci_dev *pdev, int set_bit) pci_dev_put(ali_isa_bridge); } -int pci_dma_supported(struct pci_dev *pdev, u64 device_mask) +int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask) { u64 dma_addr_mask; |