From: Colin Cross <ccross@android.com>
Date: Wed, 24 Nov 2010 22:34:35 +0000 (-0800)
Subject: ARM: tegra: fuse: Fix warnings
X-Git-Tag: firefly_0821_release~9833^2~99^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5310d336e188883341c9069115e05540c16891b1;p=firefly-linux-kernel-4.4.55.git

ARM: tegra: fuse: Fix warnings

Change-Id: I2793cb8413669dbae8c6ca92572c423e27f46c4e
Signed-off-by: Colin Cross <ccross@android.com>
---

diff --git a/arch/arm/mach-tegra/tegra2_fuse.c b/arch/arm/mach-tegra/tegra2_fuse.c
index c2c8ef5356c8..a488a392716c 100644
--- a/arch/arm/mach-tegra/tegra2_fuse.c
+++ b/arch/arm/mach-tegra/tegra2_fuse.c
@@ -63,7 +63,7 @@
 static u32 fuse_pgm_data[NFUSES / 2];
 static u32 fuse_pgm_mask[NFUSES / 2];
 static u32 tmp_fuse_pgm_data[NFUSES / 2];
-static u8 master_enable;
+static u32 master_enable;
 
 DEFINE_MUTEX(fuse_lock);
 
@@ -144,7 +144,7 @@ static struct param_info fuse_info_tbl[] = {
 		.data_offset = 10,
 	},
 	[ODM_RSVD] = {
-		.addr = &fuse_info.odm_rsvd,
+		.addr = fuse_info.odm_rsvd,
 		.sz = sizeof(fuse_info.odm_rsvd),
 		.start_off = 0x16,
 		.start_bit = 4,