diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2015-06-05 17:22:36 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-06-05 17:22:36 -0700 |
commit | d3000d0d4a2b326a3b98df53b53adcd3beead72e (patch) | |
tree | 6ba4ac2a7693710f6997daa6ce48505cf54f9ec1 /drivers/clk/Makefile | |
parent | 4a1caed3d0c2fbf8c9f18909bec69e2aa2638b97 (diff) | |
parent | 28b9fcd016126e6495d486c169fddaf26091a04b (diff) | |
download | linux-stable-d3000d0d4a2b326a3b98df53b53adcd3beead72e.tar.gz linux-stable-d3000d0d4a2b326a3b98df53b53adcd3beead72e.tar.bz2 linux-stable-d3000d0d4a2b326a3b98df53b53adcd3beead72e.zip |
Merge branch 'clk-meson8b' into clk-next
* clk-meson8b:
clk: meson8b: Add support for Meson8b clocks
clk: meson: Document bindings for Meson8b clock controller
clk: meson: Add support for Meson clock controller
Diffstat (limited to 'drivers/clk/Makefile')
-rw-r--r-- | drivers/clk/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index a4b9b5f4a091..3233f0e8bf43 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -55,6 +55,7 @@ ifeq ($(CONFIG_COMMON_CLK), y) obj-$(CONFIG_ARCH_MMP) += mmp/ endif obj-$(CONFIG_PLAT_ORION) += mvebu/ +obj-$(CONFIG_ARCH_MESON) += meson/ obj-$(CONFIG_ARCH_MXS) += mxs/ obj-$(CONFIG_MACH_PISTACHIO) += pistachio/ obj-$(CONFIG_COMMON_CLK_PXA) += pxa/ |