From: Peter Huewe <PeterHuewe@gmx.de>
To: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@codeaurora.org>,
Bryan Huntsman <bryanh@codeaurora.org>,
Russell King <linux@arm.linux.org.uk>,
linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] arm/mach-msm: Add CONFIG conditional for board-trout
Date: Thu, 29 Apr 2010 02:41:22 +0200 [thread overview]
Message-ID: <201004290241.23068.PeterHuewe@gmx.de> (raw)
From: Peter Huewe <peterhuewe@gmx.de>
This patch adds a conditional for CONFIG_MSM_DEBUG_UART to prevent a
build failure[1], this is done the same way as for every board in mach-msm.
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2448102/
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
KernelVersion: linux-next-20100429
arch/arm/mach-msm/board-trout.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index 9793ff4..b88aec2 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -82,8 +82,10 @@ static void __init trout_map_io(void)
}
MACHINE_START(TROUT, "HTC Dream")
+#ifdef CONFIG_MSM_DEBUG_UART
.phys_io = MSM_DEBUG_UART_PHYS,
.io_pg_offst = ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc,
+#endif
.boot_params = 0x10000100,
.fixup = trout_fixup,
.map_io = trout_map_io,
--
1.6.4.4
next reply other threads:[~2010-04-29 0:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-29 0:41 Peter Huewe [this message]
2010-04-28 6:08 ` [PATCH] arm/mach-msm: Add CONFIG conditional for board-trout Pavel Machek
2010-05-01 10:14 ` Russell King - ARM Linux
2010-05-02 14:56 ` Daniel Walker
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=201004290241.23068.PeterHuewe@gmx.de \
--to=peterhuewe@gmx.de \
--cc=bryanh@codeaurora.org \
--cc=davidb@codeaurora.org \
--cc=dwalker@codeaurora.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/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