diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
| commit | 11c2d8174ed3dc4f1971564732689b4a39129702 (patch) | |
| tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 /arch/arm/common/dmabounce.c | |
| parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
Diffstat (limited to 'arch/arm/common/dmabounce.c')
| -rw-r--r-- | arch/arm/common/dmabounce.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c index 52fc6a883281..2744673314b4 100644 --- a/arch/arm/common/dmabounce.c +++ b/arch/arm/common/dmabounce.c | |||
| @@ -650,7 +650,8 @@ EXPORT_SYMBOL(dma_map_sg); | |||
| 650 | EXPORT_SYMBOL(dma_unmap_sg); | 650 | EXPORT_SYMBOL(dma_unmap_sg); |
| 651 | EXPORT_SYMBOL(dma_sync_single_for_cpu); | 651 | EXPORT_SYMBOL(dma_sync_single_for_cpu); |
| 652 | EXPORT_SYMBOL(dma_sync_single_for_device); | 652 | EXPORT_SYMBOL(dma_sync_single_for_device); |
| 653 | EXPORT_SYMBOL(dma_sync_sg); | 653 | EXPORT_SYMBOL(dma_sync_sg_for_cpu); |
| 654 | EXPORT_SYMBOL(dma_sync_sg_for_device); | ||
| 654 | EXPORT_SYMBOL(dmabounce_register_dev); | 655 | EXPORT_SYMBOL(dmabounce_register_dev); |
| 655 | EXPORT_SYMBOL(dmabounce_unregister_dev); | 656 | EXPORT_SYMBOL(dmabounce_unregister_dev); |
| 656 | 657 | ||