From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756283AbZEKNmY (ORCPT ); Mon, 11 May 2009 09:42:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754332AbZEKNle (ORCPT ); Mon, 11 May 2009 09:41:34 -0400 Received: from mx1.emlix.com ([193.175.82.87]:42059 "EHLO mx1.emlix.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751695AbZEKNlc (ORCPT ); Mon, 11 May 2009 09:41:32 -0400 From: Johannes Weiner To: Chris Zankel Cc: linux-kernel@vger.kernel.org, Oskar Schirmer Subject: [patch 3/5] xtensa: fix wrong extern declaration renamed in code using it Date: Mon, 11 May 2009 15:43:35 +0200 Message-Id: <1242049417-12564-4-git-send-email-jw@emlix.com> In-Reply-To: <1242049417-12564-1-git-send-email-jw@emlix.com> References: <1242049417-12564-1-git-send-email-jw@emlix.com> Organization: emlix gmbh, Goettingen, Germany Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oskar Schirmer The variable ccount_nsec has been renamed to nsec_per_ccount in arch/xtensa/kernel/time.c in 2b8aea74 (2007-08-05), but the fix failed to rename the variable in arch/xtensa/include/asm/timex.h as well. Signed-off-by: Oskar Schirmer --- arch/xtensa/include/asm/timex.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/xtensa/include/asm/timex.h b/arch/xtensa/include/asm/timex.h index b83a818..053bc42 100644 --- a/arch/xtensa/include/asm/timex.h +++ b/arch/xtensa/include/asm/timex.h @@ -39,9 +39,9 @@ #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT extern unsigned long ccount_per_jiffy; -extern unsigned long ccount_nsec; +extern unsigned long nsec_per_ccount; #define CCOUNT_PER_JIFFY ccount_per_jiffy -#define NSEC_PER_CCOUNT ccount_nsec +#define NSEC_PER_CCOUNT nsec_per_ccount #else #define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ)) #define NSEC_PER_CCOUNT (1000UL / CONFIG_XTENSA_CPU_CLOCK) -- 1.6.3.rc3