From mboxrd@z Thu Jan 1 00:00:00 1970 From: paul.gortmaker@windriver.com (Paul Gortmaker) Date: Mon, 5 Mar 2012 17:41:49 -0500 Subject: [PATCH 2/3] arm: fix compile error in mach-omap2/board-omap4panda.c In-Reply-To: <1330987310-8108-1-git-send-email-paul.gortmaker@windriver.com> References: <1330987310-8108-1-git-send-email-paul.gortmaker@windriver.com> Message-ID: <1330987310-8108-3-git-send-email-paul.gortmaker@windriver.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The commit 3c90c98a1ebbb08d95700ce8a3b7bce6286607bd (linux-next) "OMAP4: omap4panda: Enable audio support" introduced population of a new struct, but chose the wrong (but similarly named) struct that has none of the named fields. Change it to the struct with those fields, to fix: arch/arm/mach-omap2/board-omap4panda.c:284: error: unknown field 'hs_left_step' specified in initializer arch/arm/mach-omap2/board-omap4panda.c:285: error: unknown field 'hs_right_step' specified in initializer arch/arm/mach-omap2/board-omap4panda.c:286: error: unknown field 'hf_left_step' specified in initializer arch/arm/mach-omap2/board-omap4panda.c:287: error: unknown field 'hf_right_step' specified in initializer arch/arm/mach-omap2/board-omap4panda.c:287: warning: large integer implicitly truncated to unsigned type Signed-off-by: Paul Gortmaker CC: Peter Ujfalusi CC: Santosh Shilimkar CC: Tony Lindgren --- arch/arm/mach-omap2/board-omap4panda.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index c1a852d..e919153 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -279,7 +279,7 @@ static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers) return 0; } -static struct twl4030_codec_data twl6040_codec = { +static struct twl6040_codec_data twl6040_codec = { /* single-step ramp for headset and handsfree */ .hs_left_step = 0x0f, .hs_right_step = 0x0f, -- 1.7.9.1