diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-03-01 16:23:40 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-03-01 16:23:40 -0800 |
| commit | 3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95 (patch) | |
| tree | aa530b9801bd3acdb77cd10c15e6e344115acc84 /drivers/clk/Makefile | |
| parent | 811a498e5e9ab802cbd23a8ef9c844ec92450fa4 (diff) | |
| parent | 8a8b6eb7a87f12804f44128d6e4c59b19f224308 (diff) | |
| download | linux-3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95.tar.gz linux-3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95.tar.bz2 linux-3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95.zip | |
Merge branch 'clk-ti' into clk-next
Conflicts:
drivers/clk/Kconfig
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 b19af449d2f3..08c0003a7254 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -77,7 +77,7 @@ obj-$(CONFIG_PLAT_SPEAR) += spear/ obj-$(CONFIG_ARCH_STI) += st/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ -obj-$(CONFIG_ARCH_OMAP2PLUS) += ti/ +obj-y += ti/ obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/ obj-$(CONFIG_X86) += x86/ |