From patchwork Mon May 7 14:43:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 157337 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5417EB6FA5 for ; Tue, 8 May 2012 00:46:17 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SRPAD-0005gZ-Tg; Mon, 07 May 2012 14:43:50 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SRP9v-0005Wl-67 for linux-arm-kernel@lists.infradead.org; Mon, 07 May 2012 14:43:32 +0000 Received: by mail-pz0-f49.google.com with SMTP id m1so2810190dad.36 for ; Mon, 07 May 2012 07:43:30 -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=+ZMuIpaIp8riePkpEPRO7N6nQnSHVtEpdfR+q8RYy7A=; b=MfjtNMI8L96fhxmvtRND7LyJbgtqxAjMU0D/jNF9/d7prFK8YXbv9xI85vPAqlZUEf Nv/B8eU4qA5vshn1vE9BgVPfkLImGdaEZwmHbfDlSuzMDLg43pFWFJSQZqlSIexzcgMO 7RZfDn+FGR92USe5j8NaCY+q9n2dLl1SU3/rU3mBtWHsYpwyIPYXYw6GGwIL8sDKujZc GAkHQC71TZFq24gChzMO2BMCwOsGE3tgGnzbk61MTuibL5/xAkJebIy6/EaUkhWJAD7s lzjTmgHEqQBbyzBwVg80ka9AWRuw/QWZ0DckBFZMubu1Um+uDAV8dYd83EGuyZkxr67h 0vwQ== Received: by 10.68.129.194 with SMTP id ny2mr32746402pbb.56.1336401810828; Mon, 07 May 2012 07:43:30 -0700 (PDT) Received: from localhost.localdomain ([114.216.145.13]) by mx.google.com with ESMTPS id pu9sm18499687pbc.36.2012.05.07.07.43.24 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 May 2012 07:43:29 -0700 (PDT) From: Shawn Guo To: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/10] mmc: mxs-mmc: move header from mach into linux folder Date: Mon, 7 May 2012 22:43:06 +0800 Message-Id: <1336401793-13753-5-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1336401793-13753-1-git-send-email-shawn.guo@linaro.org> References: <1336401793-13753-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQnJuS3rvht67uhhMZnwp+jdlryiiJ0ztWZQq0mUC6X9wLATTapSL2sbbNjhjP6YtpAwUVco X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Marek Vasut , Chris Ball , Dong Aisheng , Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Rename arch/arm/mach-mxs/include/mach/mmc.h to include/linux/mmc/mxs-mmc.h, so that mxs-mmc driver becomes inclusion free. Signed-off-by: Shawn Guo Acked-by: Marek Vasut --- arch/arm/mach-mxs/include/mach/devices-common.h | 2 +- drivers/mmc/host/mxs-mmc.c | 3 +-- .../mach/mmc.h => include/linux/mmc/mxs-mmc.h | 7 ++++--- 3 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm/mach-mxs/include/mach/mmc.h => include/linux/mmc/mxs-mmc.h (81%) diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h index 2b37689..6fc0601 100644 --- a/arch/arm/mach-mxs/include/mach/devices-common.h +++ b/arch/arm/mach-mxs/include/mach/devices-common.h @@ -87,7 +87,7 @@ struct platform_device * __init mxs_add_mxs_i2c( const struct mxs_mxs_i2c_data *data); /* mmc */ -#include +#include struct mxs_mxs_mmc_data { const char *devid; int id; diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 54bbb8b..c70c7c7 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -41,8 +41,7 @@ #include #include #include - -#include +#include #define DRIVER_NAME "mxs-mmc" diff --git a/arch/arm/mach-mxs/include/mach/mmc.h b/include/linux/mmc/mxs-mmc.h similarity index 81% rename from arch/arm/mach-mxs/include/mach/mmc.h rename to include/linux/mmc/mxs-mmc.h index 211547a..7c2ad3a 100644 --- a/arch/arm/mach-mxs/include/mach/mmc.h +++ b/include/linux/mmc/mxs-mmc.h @@ -6,8 +6,8 @@ * published by the Free Software Foundation. */ -#ifndef __MACH_MXS_MMC_H__ -#define __MACH_MXS_MMC_H__ +#ifndef __LINUX_MMC_MXS_MMC_H__ +#define __LINUX_MMC_MXS_MMC_H__ struct mxs_mmc_platform_data { int wp_gpio; /* write protect pin */ @@ -15,4 +15,5 @@ struct mxs_mmc_platform_data { #define SLOTF_4_BIT_CAPABLE (1 << 0) #define SLOTF_8_BIT_CAPABLE (1 << 1) }; -#endif /* __MACH_MXS_MMC_H__ */ + +#endif /* __LINUX_MMC_MXS_MMC_H__ */