Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753558Ab2JRB55 (ORCPT ); Wed, 17 Oct 2012 21:57:57 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:47538 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753243Ab2JRB5z (ORCPT ); Wed, 17 Oct 2012 21:57:55 -0400 From: Laurent Pinchart To: linux-kernel@vger.kernel.org Cc: Marek Szyprowski Subject: [PATCH 1/2] drivers: dma-contiguous: Don't redefine SZ_1M Date: Thu, 18 Oct 2012 03:58:40 +0200 Message-Id: <1350525521-2148-1-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.7.8.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1009 Lines: 36 Use the definition from linux/sizes.h instead. Signed-off-by: Laurent Pinchart --- 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 #include #include +#include #include #include #include #include -#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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/