Subject: linux-next: manual merge of the clk tree with the fsl tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 2 Nov 2015 01:35:22 +1100

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/clk/Kconfig

between commit:

  9e19ca2f627e ("clk: qoriq: Add ls2080a support.")

from the fsl tree and commit:

  4a7748c3d641 ("clk: Allow drivers to build if COMPILE_TEST is enabled")

from the clk 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/clk/Kconfig
index 67826167a0e0,57316528e924..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -131,7 -132,7 +142,7 @@@ config COMMON_CLK_AXI_CLKGE
  
  config CLK_QORIQ
  	bool "Clock driver for Freescale QorIQ platforms"
- 	depends on (PPC_E500MC || ARM || ARM64) && OF
 -	depends on (PPC_E500MC || ARM || COMPILE_TEST) && OF
++	depends on (PPC_E500MC || ARM || ARM64 || COMPILE_TEST) && OF
  	---help---
  	  This adds the clock driver support for Freescale QorIQ platforms
  	  using common clock framework.