summaryrefslogtreecommitdiffstats
path: root/drivers/clk/Makefile
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2014-10-01 23:39:29 +0200
committerMike Turquette <mturquette@linaro.org>2014-10-05 22:41:53 +0200
commit98d147f50eb0ce4328e013f5f2c076896003c761 (patch)
tree01b087778cfff3b8032152ca828bf9aba4882d65 /drivers/clk/Makefile
parentMerge tag 'clk-mvebu-3.18-2' of git://git.infradead.org/linux-mvebu into clk-... (diff)
downloadlinux-98d147f50eb0ce4328e013f5f2c076896003c761.tar.xz
linux-98d147f50eb0ce4328e013f5f2c076896003c761.zip
clk: pxa clocks build system fix
Fix the building of pxa clock drivers so that the files are actually compiled if and only if COMMON_CLK was selected by the architecture. This prevents conflicts with mach-pxa clock legacy implementation. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/Makefile')
-rw-r--r--drivers/clk/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 8f3c04a91511..5eaf1b547f19 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -51,7 +51,7 @@ obj-$(CONFIG_ARCH_MMP) += mmp/
endif
obj-$(CONFIG_PLAT_ORION) += mvebu/
obj-$(CONFIG_ARCH_MXS) += mxs/
-obj-$(CONFIG_ARCH_PXA) += pxa/
+obj-$(CONFIG_COMMON_CLK_PXA) += pxa/
obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/
obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/