As a preparatory step make sure the Tegra20 display header file is properly ifdef gated with its name.
Signed-off-by: Marcel Ziswiler marcel.ziswiler@toradex.com ---
arch/arm/include/asm/arch-tegra20/display.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/include/asm/arch-tegra20/display.h b/arch/arm/include/asm/arch-tegra20/display.h index 018c9f9..0089536 100644 --- a/arch/arm/include/asm/arch-tegra20/display.h +++ b/arch/arm/include/asm/arch-tegra20/display.h @@ -5,8 +5,8 @@ * SPDX-License-Identifier: GPL-2.0+ */
-#ifndef __ASM_ARCH_TEGRA_DISPLAY_H -#define __ASM_ARCH_TEGRA_DISPLAY_H +#ifndef __ASM_ARCH_TEGRA20_DISPLAY_H +#define __ASM_ARCH_TEGRA20_DISPLAY_H
#include <asm/arch-tegra/dc.h> #include <fdtdec.h> @@ -134,4 +134,4 @@ int tegra_lcd_check_next_stage(const void *blob, int wait); */ void tegra_lcd_early_init(const void *blob);
-#endif /*__ASM_ARCH_TEGRA_DISPLAY_H*/ +#endif /*__ASM_ARCH_TEGRA20_DISPLAY_H*/