diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-07-20 23:59:16 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 00:01:16 -0700 |
| commit | d0d5864676dbccfb1337864a0ae6ce97e6342678 (patch) | |
| tree | 7caa674ec05a1797054cd4304f0a047b6dacddd6 /arch/sparc/include/asm/dma-mapping.h | |
| parent | 6534e6809e6c9d48114b537afe03bee3fd33bf01 (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
| download | op-kernel-dev-d0d5864676dbccfb1337864a0ae6ce97e6342678.zip op-kernel-dev-d0d5864676dbccfb1337864a0ae6ce97e6342678.tar.gz | |
Merge tag 'v3.16-rc6' into MTD development branch
Linux 3.16-rc6
Diffstat (limited to 'arch/sparc/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/sparc/include/asm/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h index 05fe53f..1ee0271 100644 --- a/arch/sparc/include/asm/dma-mapping.h +++ b/arch/sparc/include/asm/dma-mapping.h @@ -7,7 +7,7 @@ #define DMA_ERROR_CODE (~(dma_addr_t)0x0) -extern int dma_supported(struct device *dev, u64 mask); +int dma_supported(struct device *dev, u64 mask); #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) |
