summaryrefslogtreecommitdiff
path: root/drivers/clk/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-21 13:06:05 +0400
committerOlof Johansson <olof@lixom.net>2012-11-21 14:13:11 +0400
commit17bffc78438d010c3e57ad5c1956e3ab50be423a (patch)
treeb69583a61ba780be64ce806c208bc170ff44fa4f /drivers/clk/Makefile
parentf86804af89686562fdeeabbdc0dfc6db9397f202 (diff)
parentbcd6f569e87471d7f104bd9497f0b516a3b12e32 (diff)
downloadlinux-17bffc78438d010c3e57ad5c1956e3ab50be423a.tar.xz
Merge branch 'depends/clk' into next/soc
From Mike Turquette: * depends/clk: clk: Common clocks implementation for Versatile Express clk: Versatile Express clock generators ("osc") driver CLK: clk-twl6040: Initial clock driver for OMAP4+ McPDM fclk clock clk: fix return value check in sirfsoc_of_clk_init() clk: fix return value check in of_fixed_clk_setup() clk: ux500: Update sdmmc clock to 100MHz for u8500 clk: ux500: Support prcmu ape opp voltage clock mfd: dbx500: Export prmcu_request_ape_opp_100_voltage clk: Don't return negative numbers for unsigned values with !clk clk: Fix documentation typos clk: Document .is_enabled op clk: SPEAr: Vco-pll: Fix compilation warning
Diffstat (limited to 'drivers/clk/Makefile')
-rw-r--r--drivers/clk/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 9c300a828ede..a96bda3d3b84 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -24,3 +24,4 @@ obj-$(CONFIG_ARCH_SUNXI) += clk-sunxi.o
# Chip specific
obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o
+obj-$(CONFIG_CLK_TWL6040) += clk-twl6040.o