diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 19:11:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 19:11:59 -0700 |
| commit | 3b38f56c9dc262c31391b5ae095178960108049b (patch) | |
| tree | 9e1ec7eaf97548cb14f43fc67bf5eb1599bbe220 /drivers | |
| parent | b3b7568490bb66688ee64f4ab72ec697f4f983c5 (diff) | |
| parent | aca0156a9c4ba47ca021b69d1fd7442aff49a7ab (diff) | |
Merge branch 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA-mapping fix from Marek Szyprowski:
"A build bugfix for the device tree support for reserved memory
regions. Due to superfluous include the common code failed to build
on ARM64 and MIPS architectures.
The patch that caused the build break has lived at linux-next for
about two weeks and noone noticed the issue, what convinced me that
everything was ok"
* 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
drivers: of: fix build break if asm/dma-contiguous.h is missing
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/of_reserved_mem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index a754b84ba016..0fe40c7d6904 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -11,8 +11,6 @@ * License or (at your optional) any later version of the license. */ -#include <asm/dma-contiguous.h> - #include <linux/memblock.h> #include <linux/err.h> #include <linux/of.h> |