diff options
| author | Preetham Chandru R <pchandru@nvidia.com> | 2012-10-10 15:37:28 +0530 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2012-10-12 13:10:11 -0700 |
| commit | b0935d3914c6a01349eaacce08d28620e7b78f6f (patch) | |
| tree | 3054561817f02cceadef7e365d36d365e8988b91 | |
| parent | 1a2a5beb5de03cb58e4a37fa72193a8e662e9b22 (diff) | |
ARM: tegra: rename fuse driver
The fuse driver registers parameters and thus
create a /sys/module/fuse directory which collides
with the fuse filesystem driver.
Rename fuse.c to tegra-fuse.c to fix this.
Bug 1058350
Change-Id: I5201bc43fcb44df8181085322bc40d1f6e99bf93
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
Reviewed-on: http://git-master/r/143206
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Stephen Warren <swarren@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra_fuse.c (renamed from arch/arm/mach-tegra/fuse.c) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 3aa3e32848f8..85e1964a2284 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -39,7 +39,7 @@ AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec) obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += sleep-t2.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += sleep-t3.o -obj-y += fuse.o +obj-y += tegra_fuse.o obj-y += kfuse.o obj-y += csi.o obj-$(CONFIG_TEGRA_SILICON_PLATFORM) += tegra_odm_fuses.o diff --git a/arch/arm/mach-tegra/fuse.c b/arch/arm/mach-tegra/tegra_fuse.c index bb7c242ef47e..11328c4cada3 100644 --- a/arch/arm/mach-tegra/fuse.c +++ b/arch/arm/mach-tegra/tegra_fuse.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-tegra/fuse.c + * arch/arm/mach-tegra/tegra_fuse.c * * Copyright (C) 2010 Google, Inc. * Copyright (C) 2010-2012 NVIDIA Corp. |