From: Stephen Warren swarren@nvidia.com
This header is only needed by code local to mach-tegra, so move it there to avoid polluting the global include path.
Signed-off-by: Stephen Warren swarren@nvidia.com --- .../{include/asm/arch-tegra20 => mach-tegra/tegra20}/sdram_param.h | 6 +++--- arch/arm/mach-tegra/tegra20/warmboot.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20}/sdram_param.h (96%)
diff --git a/arch/arm/include/asm/arch-tegra20/sdram_param.h b/arch/arm/mach-tegra/tegra20/sdram_param.h similarity index 96% rename from arch/arm/include/asm/arch-tegra20/sdram_param.h rename to arch/arm/mach-tegra/tegra20/sdram_param.h index aaf05084e96f..19cb5ab2f47a 100644 --- a/arch/arm/include/asm/arch-tegra20/sdram_param.h +++ b/arch/arm/mach-tegra/tegra20/sdram_param.h @@ -1,12 +1,12 @@ /* - * (C) Copyright 2010, 2011 + * (C) Copyright 2010-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ */
-#ifndef _SDRAM_PARAM_H_ -#define _SDRAM_PARAM_H_ +#ifndef _TEGRA20_SDRAM_PARAM_H +#define _TEGRA20_SDRAM_PARAM_H
/* * Defines the number of 32-bit words provided in each set of SDRAM parameters diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c index 94298907c084..9d67bdef494a 100644 --- a/arch/arm/mach-tegra/tegra20/warmboot.c +++ b/arch/arm/mach-tegra/tegra20/warmboot.c @@ -11,7 +11,6 @@ #include <asm/arch/clock.h> #include <asm/arch/gp_padctrl.h> #include <asm/arch/pinmux.h> -#include <asm/arch/sdram_param.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/clk_rst.h> #include "../apb_misc.h" @@ -20,6 +19,7 @@ #include "../pmc.h" #include "crypto.h" #include "emc_priv.h" +#include "sdram_param.h" #include "warmboot.h"
DECLARE_GLOBAL_DATA_PTR;