summaryrefslogtreecommitdiffstats
path: root/drivers/clk/Makefile
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-06-19 23:44:25 +0200
committerMike Turquette <mturquette@linaro.org>2012-07-11 15:36:45 -0700
commit50667d63085af108f625c83102430c1d74931d78 (patch)
tree62285dcaf8733ef5e9257db9ec6029ca7745c26c /drivers/clk/Makefile
parent9ca1c5a4bf4105d6f2f2a46892495953dd3e2fec (diff)
downloadop-kernel-dev-50667d63085af108f625c83102430c1d74931d78.zip
op-kernel-dev-50667d63085af108f625c83102430c1d74931d78.tar.gz
ARM: u300: convert to common clock
This converts the U300 clock implementation over to use the common struct clk and moves the implementation down into drivers/clk. Since VCO isn't used in tree it was removed, it's not hard to put it back in if need be. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> [mturquette@linaro.org: trivial Makefile conflict] Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/Makefile')
-rw-r--r--drivers/clk/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index b679f11..35d9fb4 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -1,10 +1,11 @@
-
+# common clock types
obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o
obj-$(CONFIG_COMMON_CLK) += clk.o clk-fixed-rate.o clk-gate.o \
clk-mux.o clk-divider.o clk-fixed-factor.o
# SoCs specific
obj-$(CONFIG_ARCH_MXS) += mxs/
obj-$(CONFIG_PLAT_SPEAR) += spear/
+obj-$(CONFIG_ARCH_U300) += clk-u300.o
# Chip specific
obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
OpenPOWER on IntegriCloud