diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 11:51:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 11:51:51 -0700 |
| commit | ff806d034ef8e9a95ff0b0532104dd65332e446b (patch) | |
| tree | 6170ccd68e32ac47666879c35e9a2af922bbf446 /arch/arm/include | |
| parent | 312c76f1a3989b8d0c0c13fee765bb2c41f2d114 (diff) | |
| parent | f70e3c4f8b6ab61f713e040822ec51f5de498146 (diff) | |
Merge branch 'for-v3.16' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping into next
Pull CMA and DMA-mapping fixes from Marek Szyprowski:
"A few fixes for dma-mapping and CMA subsystems"
* 'for-v3.16' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
CMA: correct unlock target
drivers/base/dma-contiguous.c: erratum of dev_get_cma_area
arm: dma-mapping: add checking cma area initialized
arm: dma-iommu: Clean up redundant variable
cma: Remove potential deadlock situation
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/dma-iommu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-iommu.h b/arch/arm/include/asm/dma-iommu.h index eec0a12c5c1..8e3fcb924db 100644 --- a/arch/arm/include/asm/dma-iommu.h +++ b/arch/arm/include/asm/dma-iommu.h @@ -18,7 +18,6 @@ struct dma_iommu_mapping { unsigned int extensions; size_t bitmap_size; /* size of a single bitmap */ size_t bits; /* per bitmap */ - unsigned int size; /* per bitmap */ dma_addr_t base; spinlock_t lock; |