projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| b74db2ac GKH |
1 | From f35b6542c3ac3f28056d298348a81f7d56d3a041 Mon Sep 17 00:00:00 2001 |
| 2 | From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | |
| 3 | Date: Mon, 23 Jan 2017 12:07:41 -0600 | |
| 4 | Subject: clk: Make x86/ conditional on CONFIG_COMMON_CLK | |
| 5 | ||
| 6 | From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | |
| 7 | ||
| 8 | commit f35b6542c3ac3f28056d298348a81f7d56d3a041 upstream. | |
| 9 | ||
| 10 | Fix Makefile for x86 support, dependency on CONFIG_COMMON_CLK | |
| 11 | was not explicit | |
| 12 | ||
| 13 | Fixes: 701190fd7419 ('clk: x86: add support for Lynxpoint LPSS clocks') | |
| 14 | Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | |
| 15 | Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> | |
| 16 | Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> | |
| 17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 18 | ||
| 19 | --- | |
| 20 | drivers/clk/Makefile | 2 ++ | |
| 21 | 1 file changed, 2 insertions(+) | |
| 22 | ||
| 23 | --- a/drivers/clk/Makefile | |
| 24 | +++ b/drivers/clk/Makefile | |
| 25 | @@ -87,6 +87,8 @@ obj-y += ti/ | |
| 26 | obj-$(CONFIG_CLK_UNIPHIER) += uniphier/ | |
| 27 | obj-$(CONFIG_ARCH_U8500) += ux500/ | |
| 28 | obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/ | |
| 29 | +ifeq ($(CONFIG_COMMON_CLK), y) | |
| 30 | obj-$(CONFIG_X86) += x86/ | |
| 31 | +endif | |
| 32 | obj-$(CONFIG_ARCH_ZX) += zte/ | |
| 33 | obj-$(CONFIG_ARCH_ZYNQ) += zynq/ |