diff options
author | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:48 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:48 +0100 |
commit | 8417d689429075fe59d92af4036e25424b13ea9c (patch) | |
tree | f0d341e6eae1cd5c4ca6180aeb29a00e21ff8a8e /drivers/clk/versatile/Makefile | |
parent | 83e4a8b0fe64a97fc92f436c7eff09569352c5ed (diff) | |
parent | cee7bd6c72b15e357eb375a178532851c72e789c (diff) |
Merge branch 'tracking-armlt-arm64' into integration-linux-vexpresstracking-integration-linux-vexpress-lsk-20130505.0
Conflicts:
drivers/clk/versatile/Makefile
Diffstat (limited to 'drivers/clk/versatile/Makefile')
-rw-r--r-- | drivers/clk/versatile/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/versatile/Makefile b/drivers/clk/versatile/Makefile index d1359f44043..6e76bf87ca8 100644 --- a/drivers/clk/versatile/Makefile +++ b/drivers/clk/versatile/Makefile @@ -3,5 +3,5 @@ obj-$(CONFIG_ICST) += clk-icst.o obj-$(CONFIG_ARCH_INTEGRATOR) += clk-integrator.o obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o obj-$(CONFIG_ARCH_REALVIEW) += clk-realview.o -obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o +obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o clk-sp810.o obj-$(CONFIG_VEXPRESS_CONFIG) += clk-vexpress-osc.o clk-vexpress-spc.o |