[U-Boot] [PATCH 25/60] ARM: tegra: use consistently named include guards

[Stephen Warren]

From: Stephen Warren <swarren at nvidia.com>

... and add one missing set of include guards.

Signed-off-by: Stephen Warren <swarren at nvidia.com>
---
 arch/arm/mach-tegra/cpu.h                  | 6 ++++++
 arch/arm/mach-tegra/emc.h                  | 6 +++---
 arch/arm/mach-tegra/tegra20/crypto.h       | 6 +++---
 arch/arm/mach-tegra/tegra20/warmboot_avp.h | 4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-tegra/cpu.h b/arch/arm/mach-tegra/cpu.h
index 88ffb29d18e1..e6dcfe25dfe3 100644
--- a/arch/arm/mach-tegra/cpu.h
+++ b/arch/arm/mach-tegra/cpu.h
@@ -4,6 +4,10 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
+
+#ifndef _TEGRA_CPU_H
+#define _TEGRA_CPU_H
+
 #include <asm/types.h>
 
 /* Stabilization delays, in usec */
@@ -86,3 +90,5 @@ bool tegra_cpu_is_non_secure(void);
 #endif
 /* Set up early UART output */
 void board_init_uart_f(void);
+
+#endif
diff --git a/arch/arm/mach-tegra/emc.h b/arch/arm/mach-tegra/emc.h
index 4095235179f5..46e1260585a1 100644
--- a/arch/arm/mach-tegra/emc.h
+++ b/arch/arm/mach-tegra/emc.h
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
- * (C) Copyright 2010,2011 NVIDIA Corporation <www.nvidia.com>
+ * (C) Copyright 2010-2016 NVIDIA Corporation <www.nvidia.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef _NVIDIA_EMC_H_
-#define _NVIDIA_EMC_H_
+#ifndef _TEGRA_EMC_H
+#define _TEGRA_EMC_H
 
 int board_emc_init(void);
 
diff --git a/arch/arm/mach-tegra/tegra20/crypto.h b/arch/arm/mach-tegra/tegra20/crypto.h
index f59b92768a44..55f7bb44cdee 100644
--- a/arch/arm/mach-tegra/tegra20/crypto.h
+++ b/arch/arm/mach-tegra/tegra20/crypto.h
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
- * (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com>
+ * (C) Copyright 2010-2016 NVIDIA Corporation <www.nvidia.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef _CRYPTO_H_
-#define _CRYPTO_H_
+#ifndef _TEGRA20_CRYPTO_H
+#define _TEGRA20_CRYPTO_H
 
 /**
  * Sign a block of data
diff --git a/arch/arm/mach-tegra/tegra20/warmboot_avp.h b/arch/arm/mach-tegra/tegra20/warmboot_avp.h
index 85892b023fad..2e5f8d016faa 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot_avp.h
+++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef _WARMBOOT_AVP_H_
-#define _WARMBOOT_AVP_H_
+#ifndef _TEGRA20_WARMBOOT_AVP_H_
+#define _TEGRA20_WARMBOOT_AVP_H_
 
 #define TEGRA_DEV_L			0
 #define TEGRA_DEV_H			1
-- 
2.8.1