From: paul.gortmaker@windriver.com (Paul Gortmaker)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] arm: fix compile error in mach-omap2/board-omap4panda.c
Date: Mon, 5 Mar 2012 17:41:49 -0500 [thread overview]
Message-ID: <1330987310-8108-3-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1330987310-8108-1-git-send-email-paul.gortmaker@windriver.com>
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 <paul.gortmaker@windriver.com>
CC: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: Santosh Shilimkar <santosh.shilimkar@ti.com>
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
next prev parent reply other threads:[~2012-03-05 22:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 22:41 [PATCH 0/3] arm: fix build breakage in omap2plus_defconfig (linux-next) Paul Gortmaker
2012-03-05 22:41 ` [PATCH 1/3] arm: anticipate build breakages due in pending merge Paul Gortmaker
2012-03-05 22:45 ` Tony Lindgren
2012-03-05 22:41 ` Paul Gortmaker [this message]
2012-03-05 22:46 ` [PATCH 2/3] arm: fix compile error in mach-omap2/board-omap4panda.c Tony Lindgren
2012-03-06 11:03 ` Peter Ujfalusi
2012-03-05 22:41 ` [PATCH 3/3] arm: more fallout from i2c conversions in board-omap4panda.c Paul Gortmaker
2012-03-06 12:27 ` Peter Ujfalusi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330987310-8108-3-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).