Message ID | 1349195816-2225-9-git-send-email-arnd@arndb.de |
---|---|
State | New |
Headers | show |
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 2c2d865..cdd620d 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -135,7 +135,9 @@ static int at91_pm_begin(suspend_state_t state) static int at91_pm_verify_clocks(void) { unsigned long scsr; +#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS int i; +#endif scsr = at91_pmc_read(AT91_PMC_SCSR);
The code using the variable 'i' in this function is conditional, so we have to make the declaration conditional as well to avoid a harmless warning. Without this patch, building at91sam9263_defconfig results in: /home/arnd/linux-arm/arch/arm/mach-at91/pm.c: In function 'at91_pm_verify_clocks': /home/arnd/linux-arm/arch/arm/mach-at91/pm.c:137:6: warning: unused variable 'i' [-Wunused-variable] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> --- arch/arm/mach-at91/pm.c | 2 ++ 1 file changed, 2 insertions(+)