summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 16:07:22 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 16:07:22 +0200
commit742b0c905d970fd60893cce14a3c68b523504bc4 (patch)
treed85689d464a8b11efe7fb6ff2f2151c4c4974871 /arch
parentMerge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git (diff)
parent[PATCH] PCI: drivers/pci/pci.c: remove pci_dac_set_dma_mask (diff)
downloadlinux-742b0c905d970fd60893cce14a3c68b523504bc4.tar.xz
linux-742b0c905d970fd60893cce14a3c68b523504bc4.zip
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6.git/
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ixp4xx/common-pci.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index 94bcdb933e41..aa92e3708838 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -502,15 +502,6 @@ pci_set_dma_mask(struct pci_dev *dev, u64 mask)
}
int
-pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask)
-{
- if (mask >= SZ_64M - 1 )
- return 0;
-
- return -EIO;
-}
-
-int
pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
{
if (mask >= SZ_64M - 1 )
@@ -520,7 +511,6 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
}
EXPORT_SYMBOL(pci_set_dma_mask);
-EXPORT_SYMBOL(pci_dac_set_dma_mask);
EXPORT_SYMBOL(pci_set_consistent_dma_mask);
EXPORT_SYMBOL(ixp4xx_pci_read);
EXPORT_SYMBOL(ixp4xx_pci_write);