diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2015-12-24 12:34:29 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2015-12-24 12:34:29 -0800 |
| commit | 5b50c522d51b748c06bd768d36f1a06f679f542b (patch) | |
| tree | f537f73fca8cb767a727e490c7627bbe4cd6a393 /drivers/clk/Makefile | |
| parent | cf87a88f519777999bf5374809b34827bb4ab5dd (diff) | |
| parent | f7c82a60ba26c2f003662bcb2cff131021c1e828 (diff) | |
| download | linux-5b50c522d51b748c06bd768d36f1a06f679f542b.tar.gz linux-5b50c522d51b748c06bd768d36f1a06f679f542b.tar.bz2 linux-5b50c522d51b748c06bd768d36f1a06f679f542b.zip | |
Merge branch 'clk-lpc32xx' into clk-next
Diffstat (limited to 'drivers/clk/Makefile')
| -rw-r--r-- | drivers/clk/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 0e0fdac2a599..b038e3666058 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -64,8 +64,8 @@ endif obj-$(CONFIG_PLAT_ORION) += mvebu/ obj-$(CONFIG_ARCH_MESON) += meson/ obj-$(CONFIG_ARCH_MXS) += mxs/ -obj-$(CONFIG_ARCH_LPC18XX) += nxp/ obj-$(CONFIG_MACH_PISTACHIO) += pistachio/ +obj-$(CONFIG_COMMON_CLK_NXP) += nxp/ obj-$(CONFIG_COMMON_CLK_PXA) += pxa/ obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ |