Merge tag 'powerpc-4.3-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

8a28d674 · Linus Torvalds <[email protected]> · 2015-10-28 18:59:53 +09:00

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

Commit: 8a28d67457b613258aa0578ccece206d166f2b9f
Parents: a22c4d7e · 977bf062

Merge commit. Changes below are compared with the first parent: a22c4d7e.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/powerpc/kernel/dma.c	modified	+1	−1	View file

arch/powerpc/kernel/dma.c

View file

diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index 59503ed..3f1472a 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)
 	dev->coherent_dma_mask = mask;
 	return 0;
 }
-EXPORT_SYMBOL_GPL(dma_set_coherent_mask);
+EXPORT_SYMBOL(dma_set_coherent_mask);
 
 #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
 