Skip to content

Commit

Permalink
drivers: dma-contiguous: Don't redefine SZ_1M
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart authored and Marek Szyprowski committed Oct 23, 2012
1 parent 6f0c058 commit 446c82f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/base/dma-contiguous.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 446c82f

Please sign in to comment.