clk: Move vendor's Kconfig into CCF menu section

Move all vendor's Kconfig into CCF menu section to prevent
new drivers putting their Kconfig files in a wrong place.

Some Kconfigs need to be modified at the same time to avoid build
warnings.

Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
[sboyd@codeaurora.org: Fix typos in commit message]
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index ef68ecb273964f7c237078752b555d326aa08056..f02495f5ca1f89fdf8312138da4314bad9b2203c 100644 (file)
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -15,6 +15,7 @@ config PLAT_S3C24XX
        select NO_IOPORT_MAP
        select S3C_DEV_NAND
        select IRQ_DOMAIN
+       select COMMON_CLK
        help
          Base platform code for any Samsung S3C24XX device
 

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index eca8e019e0054bb7443c63196b01ca217fabbd55..de707b2bfb73708789be3fa7dcf36d1aca7e7769 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -202,11 +202,9 @@ config COMMON_CLK_CDCE706
 
 source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/hisilicon/Kconfig"
-source "drivers/clk/qcom/Kconfig"
-
-endmenu
-
 source "drivers/clk/mvebu/Kconfig"
-
+source "drivers/clk/qcom/Kconfig"
 source "drivers/clk/samsung/Kconfig"
 source "drivers/clk/tegra/Kconfig"
+
+endmenu

diff --git a/drivers/clk/samsung/Kconfig b/drivers/clk/samsung/Kconfig
index 84196ecdaa12f5df319f6fafe2e9b6bd664bc9d5..b3fe5cb01afe2d2db031e9e8692161fe171bc93c 100644 (file)
--- a/drivers/clk/samsung/Kconfig
+++ b/drivers/clk/samsung/Kconfig
@@ -1,6 +1,5 @@
 config COMMON_CLK_SAMSUNG
        bool
-       select COMMON_CLK
 
 config S3C2410_COMMON_CLK
        bool