From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro•org>,
Russell King <linux@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Dmitry Eremin-Solenikov <dbaryshkov@gmail•com>,
Oleksij Rempel <linux@rempel-privat•de>
Subject: linux-next: manual merge of the clockevents tree with the arm tree
Date: Tue, 27 Jan 2015 16:24:54 +1100 [thread overview]
Message-ID: <20150127162454.4138ecd8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in
drivers/clocksource/Kconfig between commit e074ff86e8b4 ("ARM: 8251/1:
clocksource: enable pxa_timer for SA-1100 platform") from the arm tree
and commit e4940cd76934 ("ARM: clocksource: add asm9260_timer driver")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/clocksource/Kconfig
index 6b6f1e4950df,4f2240c9c145..000000000000
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -232,11 -236,13 +239,20 @@@ config CLKSRC_MIPS_GI
depends on MIPS_GIC
select CLKSRC_OF
+config CLKSRC_PXA
+ def_bool y if ARCH_PXA || ARCH_SA1100
+ select CLKSRC_OF if USE_OF
+ help
+ This enables OST0 support available on PXA and SA-11x0
+ platforms.
+
+ config ASM9260_TIMER
+ bool "Alphascale ASM9260 timer driver"
+ select CLKSRC_MMIO
+ select CLKSRC_OF
+ default y if MACH_ASM9260
+ help
+ This enables build of a clocksource and clockevent driver for
+ the 32-bit System Timer hardware available on a Alphascale ASM9260.
+
endmenu
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-01-27 5:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 5:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-02 4:52 linux-next: manual merge of the clockevents tree with the arm tree Stephen Rothwell
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=20150127162454.4138ecd8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=dbaryshkov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=linux@rempel-privat$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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