Subject: linux-next: manual merge of the h8300 tree with the imx-mxs tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 29 May 2015 12:00:13 +1000

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                    [email-masked]

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