Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
base support") from Linus' tree and commit fd3fdaf09f26 ("clk: sort
Makefile") from the clk tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc drivers/clk/Makefile index a277875d64a7,51a4c0dac1af..000000000000 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@@ -9,46 -9,43 +9,44 @@@ obj-$(CONFIG_COMMON_CLK) += clk-gate. obj-$(CONFIG_COMMON_CLK) += clk-mux.o obj-$(CONFIG_COMMON_CLK) += clk-composite.o - # SoCs specific - obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o - obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o - obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o - obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o - obj-$(CONFIG_ARCH_HI3xxx) += hisilicon/ - obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o - obj-$(CONFIG_ARCH_MXS) += mxs/ - obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ - obj-$(CONFIG_PLAT_SPEAR) += spear/ - obj-$(CONFIG_ARCH_U300) += clk-u300.o - obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/ - obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ - obj-$(CONFIG_PLAT_ORION) += mvebu/ + # hardware specific clock types + # please keep this section sorted lexicographically by file/directory path name ++obj-$(CONFIG_COMMON_CLK_AT91) += at91/ + obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o + obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o + obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o + obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o + obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o + obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o + obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o + obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o + obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o + obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o + obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o + obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o + obj-$(CONFIG_CLK_TWL6040) += clk-twl6040.o + obj-$(CONFIG_ARCH_U300) += clk-u300.o + obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o + obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o + obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o + obj-$(CONFIG_ARCH_HI3xxx) += hisilicon/ + obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/ ifeq ($(CONFIG_COMMON_CLK), y) - obj-$(CONFIG_ARCH_MMP) += mmp/ + obj-$(CONFIG_ARCH_MMP) += mmp/ endif - obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o - obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ - obj-$(CONFIG_ARCH_SUNXI) += sunxi/ - obj-$(CONFIG_ARCH_U8500) += ux500/ - obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o - obj-$(CONFIG_ARCH_SIRF) += sirf/ - obj-$(CONFIG_ARCH_ZYNQ) += zynq/ - obj-$(CONFIG_ARCH_TEGRA) += tegra/ - obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ - obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o - obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/ - obj-$(CONFIG_COMMON_CLK_AT91) += at91/ + obj-$(CONFIG_PLAT_ORION) += mvebu/ + obj-$(CONFIG_ARCH_MXS) += mxs/ + obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ + obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ + obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile/ - - obj-$(CONFIG_X86) += x86/ - obj-$(CONFIG_ARCH_BCM) += bcm/ - - # Chip specific - obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o - obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o - obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o - obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o - obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o - obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o - obj-$(CONFIG_CLK_TWL6040) += clk-twl6040.o - obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o + obj-$(CONFIG_ARCH_SIRF) += sirf/ + obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ + obj-$(CONFIG_PLAT_SPEAR) += spear/ + obj-$(CONFIG_ARCH_SUNXI) += sunxi/ + obj-$(CONFIG_ARCH_TEGRA) += tegra/ + obj-$(CONFIG_ARCH_OMAP2PLUS) += ti/ + obj-$(CONFIG_ARCH_U8500) += ux500/ + obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/ + obj-$(CONFIG_X86) += x86/ + obj-$(CONFIG_ARCH_ZYNQ) += zynq/
pgp8jq0GYXTpE.pgp
Description: PGP signature
