summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorChe-Liang Chiou <clchiou@chromium.org>2011-11-10 16:00:02 +0800
committerGerrit <chrome-bot@google.com>2011-11-13 18:48:37 -0800
commit21f54150d1500cff386f9429735f274d0a066943 (patch)
treef90ba01ca8720d87852e0fcb69235474915138b7 /arch
parentb09086595e7844d068994476bd64737dc37a072b (diff)
spi: rename tegra2_spi to tegra_spi in prep for tegra3
BUG=chromium-os:21033 TEST=build seaboard successfully Change-Id: Idbfbdbf0bdb1070f4a2b5f8205c1caff6ef0c811 Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/11471 Reviewed-by: Tom Warren <twarren@nvidia.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/arch-tegra/spi.h (renamed from arch/arm/include/asm/arch-tegra2/tegra2_spi.h)6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h b/arch/arm/include/asm/arch-tegra/spi.h
index 72dc868831..7f5035d818 100644
--- a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h
+++ b/arch/arm/include/asm/arch-tegra/spi.h
@@ -22,8 +22,8 @@
* MA 02111-1307 USA
*/
-#ifndef _TEGRA2_SPI_H_
-#define _TEGRA2_SPI_H_
+#ifndef _TEGRA_SPI_H_ /* Prepend _TEGRA_ to avoid conflict with spi.h */
+#define _TEGRA_SPI_H_
#include <asm/types.h>
@@ -73,4 +73,4 @@ struct spi_tegra {
#define SPI_TIMEOUT 1000
-#endif /* _TEGRA2_SPI_H_ */
+#endif /* _TEGRA_SPI_H_ */