From: Heiko Stuebner <heiko@sntech.de>
Date: Wed, 19 Feb 2014 00:25:54 +0000 (+0900)
Subject: ARM: S3C24XX: prevent conflicts between ccf and non-ccf s3c24xx-socs
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~45^2~7^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ab9a428cf1d118779554b6a20161d7b339310db;p=pandora-kernel.git

ARM: S3C24XX: prevent conflicts between ccf and non-ccf s3c24xx-socs

As the conversion to the common-clock-framework is done in multiple
steps, it is necessary to prevent conflicts between the different
struct clk implementations.

For this include the s3c24xx_setup_clocks function only when
SAMSUNG_CLOCK is selected and make the socs we don't convert this
time explicitly depend on SAMSUNG_CLOCK, which gets only selected
automatically if COMMON_CLK is not enabled.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---

Reading git-diff-tree failed