diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 07:07:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 07:07:22 -0700 |
commit | 742b0c905d970fd60893cce14a3c68b523504bc4 (patch) | |
tree | d85689d464a8b11efe7fb6ff2f2151c4c4974871 /arch | |
parent | 235bd6140dad7c08261abdc1f8056485c5344a74 (diff) | |
parent | 9171078ab5a0bbb516029cfc61378e0350a7b30d (diff) | |
download | linux-3.10-742b0c905d970fd60893cce14a3c68b523504bc4.tar.gz linux-3.10-742b0c905d970fd60893cce14a3c68b523504bc4.tar.bz2 linux-3.10-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.c | 10 |
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 94bcdb933e4..aa92e370883 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); |