From: Stephen Warren swarren@nvidia.com
Machine-specific headers should be in this location. Eventually, we'll move all headers from arch/arm/include to arch/arm/mach-tegra/include, or find a way to delete them.
Signed-off-by: Stephen Warren swarren@nvidia.com --- arch/arm/mach-tegra/board2.c | 2 +- .../asm/arch-tegra/mmc.h => mach-tegra/include/mach/tegra_mmc.h} | 7 ++++--- drivers/mmc/tegra_mmc.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) rename arch/arm/{include/asm/arch-tegra/mmc.h => mach-tegra/include/mach/tegra_mmc.h} (50%)
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 98fd94646909..05e83268cd40 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -31,7 +31,7 @@ #include <usb.h> #endif #ifdef CONFIG_TEGRA_MMC -#include <asm/arch-tegra/mmc.h> +#include <mach/tegra_mmc.h> #endif #include <asm/arch-tegra/xusb-padctl.h> #include <power/as3722.h> diff --git a/arch/arm/include/asm/arch-tegra/mmc.h b/arch/arm/mach-tegra/include/mach/tegra_mmc.h similarity index 50% rename from arch/arm/include/asm/arch-tegra/mmc.h rename to arch/arm/mach-tegra/include/mach/tegra_mmc.h index c2d52b297743..23f90e300b2a 100644 --- a/arch/arm/include/asm/arch-tegra/mmc.h +++ b/arch/arm/mach-tegra/include/mach/tegra_mmc.h @@ -1,11 +1,12 @@ /* * Copyright (c) 2011, Google Inc. All rights reserved. + * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. * SPDX-License-Identifier: GPL-2.0+ */
-#ifndef _TEGRA_MMC_H_ -#define _TEGRA_MMC_H_ +#ifndef _MACH_TEGRA_MMC_H_ +#define _MACH_TEGRA_MMC_H_
void tegra_mmc_init(void);
-#endif /* _TEGRA_MMC_H_ */ +#endif diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index 12b14fc35d08..6e1667b3bce7 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -10,12 +10,12 @@ #include <bouncebuf.h> #include <common.h> #include <fdtdec.h> +#include <mmc.h> #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch-tegra/clk_rst.h> -#include <asm/arch-tegra/mmc.h> -#include <mmc.h> +#include <mach/tegra_mmc.h> #include "tegra_mmc_priv.h"
DECLARE_GLOBAL_DATA_PTR;