diff options
| author | Linus Torvalds | 2017-07-05 17:41:31 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-07-05 17:41:31 -0700 |
| commit | 9b51f04424e17051a89ab32d892ca66b2a104825 (patch) | |
| tree | 919f49ed827de2b37d8f9187cbcc96d9a2cac0c5 /arch | |
| parent | 55a7b2125cf4739a8478d2d7223310ae7393408c (diff) | |
| parent | 227145eb38fbee9d88a570954b3de836c4280134 (diff) | |
Merge branch 'parisc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull another parisc update from Helge Deller:
"Christoph Hellwig provided one patch for the parisc architecture to
drop the DMA_ERROR_CODE define from the parisc architecture"
* 'parisc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: ->mapping_error
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/include/asm/dma-mapping.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/dma-mapping.h b/arch/parisc/include/asm/dma-mapping.h index 9a2a8956a695..2b16282add69 100644 --- a/arch/parisc/include/asm/dma-mapping.h +++ b/arch/parisc/include/asm/dma-mapping.h @@ -20,8 +20,6 @@ ** flush/purge and allocate "regular" cacheable pages for everything. */ -#define DMA_ERROR_CODE (~(dma_addr_t)0) - #ifdef CONFIG_PA11 extern const struct dma_map_ops pcxl_dma_ops; extern const struct dma_map_ops pcx_dma_ops; |