Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers: dma-contiguous: Don't redefine SZ_1M

Use the definition from linux/sizes.h instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

authored by

Laurent Pinchart and committed by
Marek Szyprowski
446c82fc 6f0c0580

+1 -4
+1 -4
drivers/base/dma-contiguous.c
··· 27 27 #include <linux/mm.h> 28 28 #include <linux/mutex.h> 29 29 #include <linux/page-isolation.h> 30 + #include <linux/sizes.h> 30 31 #include <linux/slab.h> 31 32 #include <linux/swap.h> 32 33 #include <linux/mm_types.h> 33 34 #include <linux/dma-contiguous.h> 34 - 35 - #ifndef SZ_1M 36 - #define SZ_1M (1 << 20) 37 - #endif 38 35 39 36 struct cma { 40 37 unsigned long base_pfn;