diff options
| author |   Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-10-18 09:29:44 +0200 |
|---|---|---|
| committer |   Marek Szyprowski <m.szyprowski@samsung.com> | 2012-10-23 14:05:32 +0200 |
| commit | 446c82fc44da5ae24a205d7130571614dc6969d3 (patch) | |
| tree | 030981ec12dda63f14192af88e824c82dcebfb0e /drivers/base/dma-contiguous.c | |
| parent | Linux 3.7-rc2 (diff) | |
| download | linux-dev-446c82fc44da5ae24a205d7130571614dc6969d3.tar.xz linux-dev-446c82fc44da5ae24a205d7130571614dc6969d3.zip | |
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>
Diffstat (limited to 'drivers/base/dma-contiguous.c')
| -rw-r--r-- | drivers/base/dma-contiguous.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 9a1469474f55..612afcc5a938 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -27,15 +27,12 @@ #include <linux/mm.h> #include <linux/mutex.h> #include <linux/page-isolation.h> +#include <linux/sizes.h> #include <linux/slab.h> #include <linux/swap.h> #include <linux/mm_types.h> #include <linux/dma-contiguous.h> -#ifndef SZ_1M -#define SZ_1M (1 << 20) -#endif - struct cma { unsigned long base_pfn; unsigned long count; |