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

Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
Reviewed-on: http://git-master/r/#change,143206
(cherry picked from commit b0935d3914c6a01349eaacce08d28620e7b78f6f)
Change-Id: I9a64479555b7e9d6ea184101923eba3d8e1d5bdf
Reviewed-on: http://git-master/r/146886
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Rebase-Id: R2e96390ca02286f6a391c0b46a74d7696c059535

diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 06cbc76958c963dad7826ac3675344914a2426bf..45ae5883674e43bea44c48971004ed06511d970b 100644 (file)
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -27,7 +27,7 @@ obj-y                                   += pm.o
 obj-$(CONFIG_TEGRA_WDT_RECOVERY)        += wdt-recovery.o
 obj-$(CONFIG_PM_SLEEP)                  += pm-irq.o
 obj-y                                   += gic.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
similarity index 99%
rename from arch/arm/mach-tegra/fuse.c
rename to arch/arm/mach-tegra/tegra_fuse.c
index 4995102d9fee792d9b138a26b25af9cabf6f4ef6..19307687b8ee97b60431faa5d161aa585545ba45 100644 (file)
--- 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.