[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1350525521-2148-1-git-send-email-laurent.pinchart@ideasonboard.com>
Date: Thu, 18 Oct 2012 03:58:40 +0200
From: Laurent Pinchart <laurent.pinchart@...asonboard.com>
To: linux-kernel@...r.kernel.org
Cc: Marek Szyprowski <m.szyprowski@...sung.com>
Subject: [PATCH 1/2] drivers: dma-contiguous: Don't redefine SZ_1M
Use the definition from linux/sizes.h instead.
Signed-off-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>
---
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 9a14694..612afcc 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;
--
1.7.8.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists