Hi Stephen, On Tue, Sep 04 2012, Stephen Warren wrote: > From: Stephen Warren <swarren@xxxxxxxxxx> > > 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 <swarren@xxxxxxxxxx> > --- > 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 <linux/gpio.h> > #include <linux/mmc/card.h> > #include <linux/mmc/host.h> > +#include <linux/mmc/tegra_sdhci.h> > > #include <asm/gpio.h> > > -#include <mach/sdhci.h> > - > #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 <y@xxxxxxxx> > * You should change the outer ifdef too: 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 <linux/mmc/host.h> After that: Acked-by: Chris Ball <cjb@xxxxxxxxxx> Thanks, - Chris. -- Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/> One Laptop Per Child -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
