diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:47 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:47 +0100 |
| commit | 83e4a8b0fe64a97fc92f436c7eff09569352c5ed (patch) | |
| tree | f246aa7e2078ad15dfb2458f9e2a578be902740c /drivers/clk/versatile/Makefile | |
| parent | fe36ba6207e538cb5d088a512dfbcba1d14f3987 (diff) | |
| parent | be19b71b407ca8fbf196814a65bfa1a99bda3370 (diff) | |
Merge branch 'tracking-armlt-tc2-cpufreq' into integration-linux-vexpress
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 ec3b88fe3e6..d1359f44043 100644 --- a/drivers/clk/versatile/Makefile +++ b/drivers/clk/versatile/Makefile @@ -4,4 +4,4 @@ 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_VEXPRESS_CONFIG) += clk-vexpress-osc.o +obj-$(CONFIG_VEXPRESS_CONFIG) += clk-vexpress-osc.o clk-vexpress-spc.o |