summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2015-10-19 13:57:03 +0900
committerTom Warren <twarren@nvidia.com>2015-11-12 09:21:07 -0700
commiteca676bd673f7737d1e85391d846f014d9c197da (patch)
treee5f51a49d960957e7b70fcc6ced26357f25794e8 /arch/arm/include/asm
parentd6bf06c0c7edf347354b208adf7618c96fd61605 (diff)
ARM: tegra: rename GPU functions
Rename GPU functions to less generic names to avoid potential name collisions. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch-tegra/gpu.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-tegra/gpu.h b/arch/arm/include/asm/arch-tegra/gpu.h
index 2fdb2c5049..4423386f28 100644
--- a/arch/arm/include/asm/arch-tegra/gpu.h
+++ b/arch/arm/include/asm/arch-tegra/gpu.h
@@ -10,11 +10,11 @@
#if defined(CONFIG_TEGRA_GPU)
-void config_gpu(void);
+void tegra_gpu_config(void);
#else /* CONFIG_TEGRA_GPU */
-static inline void config_gpu(void)
+static inline void tegra_gpu_config(void)
{
}
@@ -22,11 +22,11 @@ static inline void config_gpu(void)
#if defined(CONFIG_OF_LIBFDT)
-int gpu_enable_node(void *blob, const char *gpupath);
+int tegra_gpu_enable_node(void *blob, const char *gpupath);
#else /* CONFIG_OF_LIBFDT */
-static inline int gpu_enable_node(void *blob, const char *gpupath)
+static inline int tegra_gpu_enable_node(void *blob, const char *gpupath)
{
return 0;
}