Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752573AbaBLKK0 (ORCPT ); Wed, 12 Feb 2014 05:10:26 -0500 Received: from mail-we0-f171.google.com ([74.125.82.171]:35911 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752123AbaBLKKO (ORCPT ); Wed, 12 Feb 2014 05:10:14 -0500 From: Jean-Jacques Hiblot To: nicolas.ferre@atmel.com, plagnioj@jcrosoft.com, b.brezillon@overkiz.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, gregory.clement@free-electrons.com, Jean-Jacques Hiblot Subject: [PATCH v4 7/8] ARM: at91: prepare common clk transition for sam9261 SoC Date: Wed, 12 Feb 2014 11:06:46 +0100 Message-Id: <1392199607-27452-8-git-send-email-jjhiblot@traphandler.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392199607-27452-1-git-send-email-jjhiblot@traphandler.com> References: <1392199607-27452-1-git-send-email-jjhiblot@traphandler.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch encloses sam9261 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91) #endif" sections. Signed-off-by: Jean-Jacques Hiblot --- arch/arm/mach-at91/at91sam9261.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 5c90581..3345a2b 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -25,10 +25,12 @@ #include "at91_rstc.h" #include "soc.h" #include "generic.h" -#include "clock.h" #include "sam9_smc.h" #include "pm.h" +#if defined(CONFIG_OLD_CLK_AT91) +#include "clock.h" + /* -------------------------------------------------------------------- * Clocks * -------------------------------------------------------------------- */ @@ -264,7 +266,9 @@ static void __init at91sam9261_register_clocks(void) clk_register(&hck0); clk_register(&hck1); } - +#else +#define at91sam9261_register_clocks NULL +#endif /* -------------------------------------------------------------------- * GPIO * -------------------------------------------------------------------- */ -- 1.8.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/