From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Yoshinori Sato <ysato@users•sourceforge.jp>,
Shawn Guo <shawn.guo@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the h8300 tree with the imx-mxs tree
Date: Fri, 29 May 2015 12:00:13 +1000 [thread overview]
Message-ID: <20150529120013.6f11e7e4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 955 bytes --]
Hi Yoshinori,
Today's linux-next merge of the h8300 tree got a conflict in
drivers/clocksource/Kconfig between commit 77b0235b6b5c ("ARM: imx:
move timer driver into drivers/clocksource") from the imx-mxs tree and
commit 2b5e104dcbd8 ("h8300: clocksource") from the h8300 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 139a20795073,acce7cfb3cee..000000000000
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -259,9 -259,10 +259,15 @@@ config CLKSRC_PX
This enables OST0 support available on PXA and SA-11x0
platforms.
+config CLKSRC_IMX_GPT
+ bool "Clocksource using i.MX GPT" if COMPILE_TEST
+ depends on OF
+ select CLKSRC_MMIO
+
+ config H8300_TMR16
+ bool
+
+ config H8300_TPU
+ bool
+
endmenu
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2015-05-29 2:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150529120013.6f11e7e4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shawn.guo@linaro$(echo .)org \
--cc=ysato@users$(echo .)sourceforge.jp \
/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