Hi all,
Today's linux-next merge of the tegra tree got a conflict in
drivers/clk/Makefile between commit bd3bffb544b1 ("clk: x86: add support
for Lynxpoint LPSS clocks") from the pm tree and commit 82f6b0926514
("clk: tegra: add Tegra specific clocks") from the tegra tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/clk/Makefile
index ee11460,f0b269a..0000000
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -22,7 -22,7 +22,8 @@@ obj-$(CONFIG_ARCH_U8500) += ux500
obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o
obj-$(CONFIG_ARCH_SUNXI) += clk-sunxi.o
obj-$(CONFIG_ARCH_ZYNQ) += clk-zynq.o
+obj-$(CONFIG_X86) += x86/
+ obj-$(CONFIG_ARCH_TEGRA) += tegra/
# Chip specific
obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
Attachment:
pgpGiLqU7w01k.pgp
Description: PGP signature
