diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 21:11:26 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 21:11:32 +0200 |
| commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /drivers/clk/Makefile | |
| parent | Merge branch 'x86/mce' into x86/urgent (diff) | |
| parent | x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c (diff) | |
| download | linux-bbd771474ec44b516107685d77e1c80bbe09f141.tar.xz linux-bbd771474ec44b516107685d77e1c80bbe09f141.zip | |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/clk/Makefile')
| -rw-r--r-- | drivers/clk/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 1f736bc11c4b..b9a5158a30b1 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -1,4 +1,7 @@ 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-mux.o clk-divider.o clk-fixed-factor.o +# SoCs specific +obj-$(CONFIG_ARCH_MXS) += mxs/ +obj-$(CONFIG_PLAT_SPEAR) += spear/ |