From c377b44cfcc60a49eaaf5baf2cfee33a48ae4bd9 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 17 Mar 2012 21:10:51 +0000 Subject: [PATCH] --- yaml --- r: 296731 b: refs/heads/master c: 8fb61e33507e5d76b69467b4f96290338e96b733 h: refs/heads/master i: 296729: c1448ddf9082d325b1fa9cd383b14a569f8ad6bb 296727: c929f70d493d7191b7bb29015ff4c6d12d65c695 v: v3 --- [refs] | 2 +- trunk/drivers/clk/Kconfig | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 11f43c4757cb..f2f292423639 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d9f78ed9af0e465d2fd15550471956e7f559b9f +refs/heads/master: 8fb61e33507e5d76b69467b4f96290338e96b733 diff --git a/trunk/drivers/clk/Kconfig b/trunk/drivers/clk/Kconfig index 2eaf17ed2791..165e1febae53 100644 --- a/trunk/drivers/clk/Kconfig +++ b/trunk/drivers/clk/Kconfig @@ -9,21 +9,18 @@ config HAVE_CLK_PREPARE config HAVE_MACH_CLKDEV bool -menuconfig COMMON_CLK - bool "Common Clock Framework" +config COMMON_CLK + bool select HAVE_CLK_PREPARE ---help--- The common clock framework is a single definition of struct clk, useful across many platforms, as well as an implementation of the clock API in include/linux/clk.h. Architectures utilizing the common struct clk should select - this automatically, but it may be necessary to manually select - this option for loadable modules requiring the common clock - framework. - - If in doubt, say "N". + this option. -if COMMON_CLK +menu "Common Clock Framework" + depends on COMMON_CLK config COMMON_CLK_DISABLE_UNUSED bool "Disabled unused clocks at boot" @@ -47,4 +44,4 @@ config COMMON_CLK_DEBUG clk_flags, clk_prepare_count, clk_enable_count & clk_notifier_count. -endif +endmenu