From patchwork Tue Sep 4 22:52:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Ball X-Patchwork-Id: 1404561 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 557433FC71 for ; Tue, 4 Sep 2012 22:52:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757933Ab2IDWwZ (ORCPT ); Tue, 4 Sep 2012 18:52:25 -0400 Received: from void.printf.net ([89.145.121.20]:34415 "EHLO void.printf.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757926Ab2IDWwL (ORCPT ); Tue, 4 Sep 2012 18:52:11 -0400 Received: from c-76-24-28-220.hsd1.ma.comcast.net ([76.24.28.220] helo=octavius.laptop.org) by void.printf.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1T91yU-0004YR-Ra; Tue, 04 Sep 2012 23:52:03 +0100 From: Chris Ball To: Stephen Warren Cc: linux-mmc@vger.kernel.org, linux-tegra@vger.kernel.org, Stephen Warren Subject: Re: [PATCH] mmc: tegra: move platform data header References: <1346798565-28884-1-git-send-email-swarren@wwwdotorg.org> Date: Tue, 04 Sep 2012 18:52:00 -0400 In-Reply-To: <1346798565-28884-1-git-send-email-swarren@wwwdotorg.org> (Stephen Warren's message of "Tue, 4 Sep 2012 16:42:45 -0600") Message-ID: <87zk55flkf.fsf@octavius.laptop.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Hi Stephen, On Tue, Sep 04 2012, Stephen Warren wrote: > From: Stephen Warren > > Move the Tegra SDHCI platform data header out of arch/arm/mach-tegra, as > a pre-requisite of single zImage. > > Signed-off-by: Stephen Warren > --- > drivers/mmc/host/sdhci-tegra.c | 3 +-- > .../sdhci.h => include/linux/mmc/tegra_sdhci.h | 2 -- > 2 files changed, 1 insertions(+), 4 deletions(-) > rename arch/arm/mach-tegra/include/mach/sdhci.h => include/linux/mmc/tegra_sdhci.h (93%) > > diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c > index f98ece6..73c5d1f 100644 > --- a/drivers/mmc/host/sdhci-tegra.c > +++ b/drivers/mmc/host/sdhci-tegra.c > @@ -24,11 +24,10 @@ > #include > #include > #include > +#include > > #include > > -#include > - > #include "sdhci-pltfm.h" > > /* Tegra SDHOST controller vendor register definitions */ > diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/include/linux/mmc/tegra_sdhci.h > similarity index 93% > rename from arch/arm/mach-tegra/include/mach/sdhci.h > rename to include/linux/mmc/tegra_sdhci.h > index 4231bc7..70aa1a7 100644 > --- a/arch/arm/mach-tegra/include/mach/sdhci.h > +++ b/include/linux/mmc/tegra_sdhci.h > @@ -1,6 +1,4 @@ > /* > - * include/asm-arm/arch-tegra/include/mach/sdhci.h > - * > * Copyright (C) 2009 Palm, Inc. > * Author: Yvonne Yip > * You should change the outer ifdef too: After that: Acked-by: Chris Ball Thanks, - Chris. diff --git a/include/linux/mmc/tegra_sdhci.h b/include/linux/mmc/tegra_sdhci.h index 70aa1a7..2b31080 100644 --- a/include/linux/mmc/tegra_sdhci.h +++ b/include/linux/mmc/tegra_sdhci.h @@ -12,8 +12,8 @@ * GNU General Public License for more details. * */ -#ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H -#define __ASM_ARM_ARCH_TEGRA_SDHCI_H +#ifndef LINUX_MMC_TEGRA_SDHCI_H +#define LINUX_MMC_TEGRA_SDHCI_H #include