From mboxrd@z Thu Jan 1 00:00:00 1970 From: Huang Shijie Subject: [PATCH v2 1/2] mxs-dma : move the mxs dma.h to a more common place Date: Fri, 20 Jan 2012 15:33:37 +0800 Message-ID: <1327044818-4464-2-git-send-email-b32955@freescale.com> References: <1327044818-4464-1-git-send-email-b32955@freescale.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1327044818-4464-1-git-send-email-b32955@freescale.com> Sender: linux-mmc-owner@vger.kernel.org To: vinod.koul@intel.com Cc: shawn.guo@linaro.org, artem.bityutskiy@intel.com, shijie8@gmail.com, linux-arm-kernel@lists.infradead.org, linux-mtd@lists.infradead.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, w.sang@pengutronix.de, LW@KARO-electronics.de, alsa-devel@alsa-project.org, b29396@freescale.com, Huang Shijie List-Id: alsa-devel@alsa-project.org Move the header to a more common place. The mxs dma engine is not only used in mx23/mx28, but also used in mx50/mx6q. It will also be used in the future chips. Rename it to mxs-dma.h change mxs-dma driver, mxs-mmc driver, gpmi-nand driver, mxs-saif driver to the new header file. Signed-off-by: Huang Shijie --- drivers/dma/mxs-dma.c | 2 +- drivers/mmc/host/mxs-mmc.c | 2 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 +- .../include/mach/dma.h => include/linux/mxs-dma.h | 0 sound/soc/mxs/mxs-pcm.c | 2 +- sound/soc/mxs/mxs-pcm.h | 2 +- sound/soc/mxs/mxs-saif.c | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm/mach-mxs/include/mach/dma.h => include/linux/mxs-dma.h (100%) diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index b06cd4c..c80fbed 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -22,10 +22,10 @@ #include #include #include +#include #include #include -#include #include /* diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 382c835..1e18970 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -38,10 +38,10 @@ #include #include #include +#include #include #include -#include #include #define DRIVER_NAME "mxs-mmc" diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h index e023bcc..1c7fdbb 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include struct resources { void *gpmi_regs; diff --git a/arch/arm/mach-mxs/include/mach/dma.h b/include/linux/mxs-dma.h similarity index 100% rename from arch/arm/mach-mxs/include/mach/dma.h rename to include/linux/mxs-dma.h diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c index 105f42a..7eb186f 100644 --- a/sound/soc/mxs/mxs-pcm.c +++ b/sound/soc/mxs/mxs-pcm.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -35,7 +36,6 @@ #include #include -#include #include "mxs-pcm.h" static struct snd_pcm_hardware snd_mxs_hardware = { diff --git a/sound/soc/mxs/mxs-pcm.h b/sound/soc/mxs/mxs-pcm.h index f55ac4f..3ac9956 100644 --- a/sound/soc/mxs/mxs-pcm.h +++ b/sound/soc/mxs/mxs-pcm.h @@ -19,7 +19,7 @@ #ifndef _MXS_PCM_H #define _MXS_PCM_H -#include +#include struct mxs_pcm_dma_params { int chan_irq; diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index dccfb37..ada6344 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -24,12 +24,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include -- 1.7.3.2