From patchwork Mon Sep 17 05:34:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1465041 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 36225E0012 for ; Mon, 17 Sep 2012 05:36:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753260Ab2IQFf7 (ORCPT ); Mon, 17 Sep 2012 01:35:59 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:48593 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753171Ab2IQFf6 (ORCPT ); Mon, 17 Sep 2012 01:35:58 -0400 Received: by dady13 with SMTP id y13so658736dad.19 for ; Sun, 16 Sep 2012 22:35:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=TKCjIIrpbXK9F132+Ccyd1vQSL8T02MAKtn6jkReYLo=; b=W/8fhus66YssyFcCQG/BVv2P64ubbHDYnySS/ztMoAFesUO5YRApVhFJoLKYEqu0kH aYP6Oug7OzYuquHJaRH1Slguv1tJeqgyHAHTtNEkJw6tvQqjWtYN+FwMkNdKWmnTS5NV OrCYQfDSb76dp5Bn9XVzRn6gn4OuG7XYxccVqpgxd4fiQo1EWZr25SpYdLDcNJRRNCMz gB8t2I3kDNAdpPZQYTddrHydSU0EMLINwmverXpG/0bxzTlfB3rS4CgG5RPJorJH+fGu xbYSUa0OkbUq1vK08CPLBuolUtKwAQoC6OF3dPdaoXMhHqkSpDTl7dwflAH5DhV0GUOZ JG+A== Received: by 10.66.83.9 with SMTP id m9mr18177847pay.22.1347860158152; Sun, 16 Sep 2012 22:35:58 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([221.225.141.190]) by mx.google.com with ESMTPS id it6sm6386097pbc.14.2012.09.16.22.35.52 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 16 Sep 2012 22:35:57 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Cc: Sascha Hauer , Fabio Estevam , Rob Herring , Arnd Bergmann , Shawn Guo , Vinod Koul , Guennadi Liakhovetski , Florian Tobias Schandinat , linux-media@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: [PATCH 14/34] dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h Date: Mon, 17 Sep 2012 13:34:43 +0800 Message-Id: <1347860103-4141-15-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> References: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQnpe1GXMn8b0k+JryE0qVQZUKzTngtK0FuFUDSv2iLLIoNFJGncmB4eEL+bIWW0lzXBBSPe Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org The header ipu.h really belongs to dma subsystem rather than imx platform. Rename it to ipu-dma.h and put it into include/linux/dma/. Signed-off-by: Shawn Guo Cc: Vinod Koul Cc: Guennadi Liakhovetski Cc: Florian Tobias Schandinat Cc: linux-media@vger.kernel.org Cc: linux-fbdev@vger.kernel.org Acked-by: Guennadi Liakhovetski Acked-by: Mauro Carvalho Chehab --- drivers/dma/ipu/ipu_idmac.c | 3 +-- drivers/dma/ipu/ipu_irq.c | 3 +-- drivers/media/video/mx3_camera.c | 2 +- drivers/video/mx3fb.c | 2 +- .../mach/ipu.h => include/linux/dma/ipu-dma.h | 6 +++--- 5 files changed, 7 insertions(+), 9 deletions(-) rename arch/arm/mach-imx/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%) diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index c7573e5..6585537 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c @@ -22,8 +22,7 @@ #include #include #include - -#include +#include #include "../dmaengine.h" #include "ipu_intern.h" diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c index fa95bcc..a5ee37d 100644 --- a/drivers/dma/ipu/ipu_irq.c +++ b/drivers/dma/ipu/ipu_irq.c @@ -15,8 +15,7 @@ #include #include #include - -#include +#include #include "ipu_intern.h" diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 1481b0d..892cba5 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -24,7 +25,6 @@ #include #include -#include #include #include diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index d738108..3b63ad8 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -26,10 +26,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/arch/arm/mach-imx/include/mach/ipu.h b/include/linux/dma/ipu-dma.h similarity index 97% rename from arch/arm/mach-imx/include/mach/ipu.h rename to include/linux/dma/ipu-dma.h index 539e559..1803111 100644 --- a/arch/arm/mach-imx/include/mach/ipu.h +++ b/include/linux/dma/ipu-dma.h @@ -9,8 +9,8 @@ * published by the Free Software Foundation. */ -#ifndef _IPU_H_ -#define _IPU_H_ +#ifndef __LINUX_DMA_IPU_DMA_H +#define __LINUX_DMA_IPU_DMA_H #include #include @@ -174,4 +174,4 @@ struct idmac_channel { #define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd) #define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan) -#endif +#endif /* __LINUX_DMA_IPU_DMA_H */