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

From: Stephen Rothwell
Date: Sun Nov 01 2015 - 09:35:41 EST

Hi all,

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


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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

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
This adds the clock driver support for Freescale QorIQ platforms
using common clock framework.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at