From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tony Lindgren <tony@atomide.com>, linux-omap@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jean-Christop PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
Russell King <rmk@arm.linux.org.uk>,
Ben Gamari <bgamari.foss@gmail.com>
Subject: linux-next: manual merge of the omap tree with the arm tree
Date: Mon, 27 Dec 2010 09:41:56 +1100 [thread overview]
Message-ID: <20101227094156.5750aa6e.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/plat-omap/Kconfig between commit
6d803ba736abb5e122dede70a4720e4843dd6df4 ("ARM: 6483/1: arm & sh:
factorised duplicated clkdev.c") from the arm tree and commit
dc69d1af9e8d9cbbabff88bb35a6782187a22229 ("omap2: Make OMAP2PLUS select
OMAP_DM_TIMER") from the omap tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-omap/Kconfig
index c940843,bc0c7aa..0000000
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -17,7 -17,8 +17,8 @@@ config ARCH_OMAP
config ARCH_OMAP2PLUS
bool "TI OMAP2/3/4"
- select COMMON_CLKDEV
+ select CLKDEV_LOOKUP
+ select OMAP_DM_TIMER
help
"Systems based on OMAP2, OMAP3 or OMAP4"
next reply other threads:[~2010-12-26 22:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-26 22:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-08 1:37 linux-next: manual merge of the omap tree with the arm tree Stephen Rothwell
2010-07-08 10:14 ` Tony Lindgren
2010-07-04 23:20 Stephen Rothwell
2010-07-05 1:46 ` Nicolas Pitre
2010-07-05 7:14 ` Stephen Rothwell
2010-07-05 13:44 ` Tony Lindgren
2010-02-04 23:20 Stephen Rothwell
2010-02-04 23:30 ` Tony Lindgren
2010-02-05 0:16 ` Stephen Rothwell
2010-02-05 4:04 ` Tony Lindgren
2010-02-15 15:03 ` Russell King
2010-02-17 19:33 ` Tony Lindgren
2009-08-19 5:04 Stephen Rothwell
2009-08-20 10:20 ` Tony Lindgren
2009-08-20 13:03 ` Shilimkar, Santosh
2009-08-20 13:13 ` Shilimkar, Santosh
2009-08-20 13:55 ` Tony Lindgren
2009-08-24 13:07 ` Tony Lindgren
2009-08-24 13:14 ` Stephen Rothwell
2009-05-28 4:31 Stephen Rothwell
2009-05-28 6:25 ` Shilimkar, Santosh
2009-05-28 6:34 ` Stephen Rothwell
2009-05-28 6:40 ` Shilimkar, Santosh
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=20101227094156.5750aa6e.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bgamari.foss@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=plagnioj@jcrosoft.com \
--cc=rmk@arm.linux.org.uk \
--cc=tony@atomide.com \
/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).