[PATCH 2/3] arm: fix compile error in mach-omap2/board-omap4panda.c
From: tony@atomide.com (Tony Lindgren)
Date: 2012-03-05 22:46:28
Also in:
linux-next, linux-omap
* Paul Gortmaker [off-list ref] [120305 14:10]:
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 typeThanks, this mis-merge is something Peter should take a look at as it seems there's few other parts that got left out. Regards, Tony
quoted hunk ↗ jump to hunk
Signed-off-by: Paul Gortmaker <redacted> CC: Peter Ujfalusi <redacted> CC: Santosh Shilimkar <redacted> CC: Tony Lindgren <tony@atomide.com> --- 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