From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Russell King <rmk@arm.linux.org.uk>
Cc: linux-next@vger.kernel.org,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: linux-next: manual merge of the arm tree with the arm-current tree
Date: Wed, 6 May 2009 11:32:33 +1000 [thread overview]
Message-ID: <20090506113233.af9db4f2.sfr@canb.auug.org.au> (raw)
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in
arch/arm/Kconfig between commit 9abf137c6dbf6eabb3add98fcd8352c3dd520568
("ARM: ARCH_MXC should select HAVE_CLK") from the arm-current tree and
commit 788c9700e7855f8a8cc8875e30d2518b57385c20 ("[ARM] Kconfig: sort ARM
machine class support choice list by option name") from the arm tree.
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/Kconfig
index e60ec54,01cb452..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -292,6 -292,29 +292,30 @@@ config ARCH_FOOTBRIDG
Support for systems based on the DC21285 companion chip
("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
+ config ARCH_MXC
+ bool "Freescale MXC/iMX-based"
+ select GENERIC_TIME
+ select GENERIC_CLOCKEVENTS
+ select ARCH_MTD_XIP
+ select GENERIC_GPIO
+ select ARCH_REQUIRE_GPIOLIB
++ select HAVE_CLK
+ help
+ Support for Freescale MXC/iMX-based family of processors
+
+ config ARCH_STMP3XXX
+ bool "Freescale STMP3xxx"
+ select CPU_ARM926T
+ select HAVE_CLK
+ select COMMON_CLKDEV
+ select ARCH_REQUIRE_GPIOLIB
+ select GENERIC_TIME
+ select GENERIC_CLOCKEVENTS
+ select GENERIC_GPIO
+ select USB_ARCH_HAS_EHCI
+ help
+ Support for systems based on the Freescale 3xxx CPUs.
+
config ARCH_NETX
bool "Hilscher NetX based"
select CPU_ARM926T
next reply other threads:[~2009-05-06 1:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-06 1:32 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-12-14 23:54 linux-next: manual merge of the arm tree with the arm-current tree Stephen Rothwell
2010-12-14 23:57 ` Russell King
2010-12-15 12:28 ` Dave Martin
2010-12-15 16:43 ` Russell King
2010-12-05 23:58 Stephen Rothwell
2010-10-11 23:33 Stephen Rothwell
2010-10-12 8:03 ` Uwe Kleine-König
2010-10-12 8:28 ` Russell King
2010-10-12 9:23 ` Uwe Kleine-König
2010-10-12 9:42 ` Russell King
2010-10-12 10:02 ` Uwe Kleine-König
2010-10-12 10:35 ` Sascha Hauer
2010-10-11 1:24 Stephen Rothwell
2010-10-11 7:48 ` Anders Larsen
2010-09-27 4:21 Stephen Rothwell
2010-07-26 1:13 Stephen Rothwell
2010-02-02 0:07 Stephen Rothwell
2010-01-17 23:35 Stephen Rothwell
2010-01-18 1:33 ` Ben Dooks
2010-01-18 3:34 ` Stephen Rothwell
2009-03-23 0:06 Stephen Rothwell
2009-02-15 23:39 Stephen Rothwell
2009-02-16 0:18 ` Ryan Mallon
2009-02-16 0:29 ` Russell King
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=20090506113233.af9db4f2.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=g.liakhovetski@gmx.de \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=s.hauer@pengutronix.de \
/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).