diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
| commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
| tree | d9523b531156fedb204e31b4612519b0a7a003e7 /arch/arm/mach-ixp4xx/common-pci.c | |
| parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'arch/arm/mach-ixp4xx/common-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common-pci.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index 2d40fe1145f0..9562177b5fe1 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c | |||
| @@ -532,8 +532,6 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | |||
| 532 | return -EIO; | 532 | return -EIO; |
| 533 | } | 533 | } |
| 534 | 534 | ||
| 535 | EXPORT_SYMBOL(pci_set_dma_mask); | ||
| 536 | EXPORT_SYMBOL(pci_set_consistent_dma_mask); | ||
| 537 | EXPORT_SYMBOL(ixp4xx_pci_read); | 535 | EXPORT_SYMBOL(ixp4xx_pci_read); |
| 538 | EXPORT_SYMBOL(ixp4xx_pci_write); | 536 | EXPORT_SYMBOL(ixp4xx_pci_write); |
| 539 | 537 | ||