diff options
| author | Magnus Damm <damm@opensource.se> | 2013-07-18 05:31:18 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-07-23 09:52:25 +0900 |
| commit | cbc60e7c04f3c1390144d4a881f0a7b98b49da98 (patch) | |
| tree | cc1f4a2dd0acb22b2219cdc9f7fa0193c1ea2ec4 /arch/arm/mach-shmobile/setup-emev2.c | |
| parent | efacfce5f8a523457e9419a25d52fe39db00b26a (diff) | |
| download | blackbird-op-linux-cbc60e7c04f3c1390144d4a881f0a7b98b49da98.tar.gz blackbird-op-linux-cbc60e7c04f3c1390144d4a881f0a7b98b49da98.zip | |
ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI
Enable build of EMEV2 and KZM9D DT Reference in
case of ARCH_MULTIPLATFORM and ARCH_SHMOBILE_MULTI.
IS_ENABLED() is leaves the clock-emev2.c file out
in case of COMMON_CLK=y.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-emev2.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-emev2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c index 19980be7d6a9..1553af8e04ff 100644 --- a/arch/arm/mach-shmobile/setup-emev2.c +++ b/arch/arm/mach-shmobile/setup-emev2.c @@ -175,7 +175,8 @@ static struct resource pmu_resources[] = { void __init emev2_add_standard_devices(void) { - emev2_clock_init(); + if (!IS_ENABLED(CONFIG_COMMON_CLK)) + emev2_clock_init(); emev2_register_uart(0); emev2_register_uart(1); |
