diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-28 05:59:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-28 05:59:53 -0400 |
| commit | 8a28d67457b613258aa0578ccece206d166f2b9f (patch) | |
| tree | 54113ea738e9e5fa7aeb133210cdae037eb92783 | |
| parent | a22c4d7e34402ccdf3414f64c50365436eba7b93 (diff) | |
| parent | 977bf062bba3eb8d03f66d5b4e227e5d7ebc1e08 (diff) | |
Merge tag 'powerpc-4.3-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman:
- powerpc/dma: dma_set_coherent_mask() should not be GPL only from Ben
* tag 'powerpc-4.3-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/dma: dma_set_coherent_mask() should not be GPL only
| -rw-r--r-- | arch/powerpc/kernel/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 59503ed98e5f..3f1472a78f39 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c | |||
| @@ -303,7 +303,7 @@ int dma_set_coherent_mask(struct device *dev, u64 mask) | |||
| 303 | dev->coherent_dma_mask = mask; | 303 | dev->coherent_dma_mask = mask; |
| 304 | return 0; | 304 | return 0; |
| 305 | } | 305 | } |
| 306 | EXPORT_SYMBOL_GPL(dma_set_coherent_mask); | 306 | EXPORT_SYMBOL(dma_set_coherent_mask); |
| 307 | 307 | ||
| 308 | #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) | 308 | #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) |
| 309 | 309 | ||