Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757148AbZDVTHA (ORCPT ); Wed, 22 Apr 2009 15:07:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755529AbZDVTGP (ORCPT ); Wed, 22 Apr 2009 15:06:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:51319 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756177AbZDVTGN (ORCPT ); Wed, 22 Apr 2009 15:06:13 -0400 Message-ID: <49EF6ABE.6090308@suse.de> Date: Thu, 23 Apr 2009 03:06:38 +0800 From: Coly Li Reply-To: coly.li@suse.de Organization: SuSE Labs User-Agent: Thunderbird 2.0.0.18 (X11/20081112) MIME-Version: 1.0 To: LKML Cc: Johannes Weiner , Ingo Molnar Subject: [PATCH 7/7] xtensa: ccount_read() X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1058 Lines: 34 This patch modifies parameter of au1x_counter1_read() from 'void' to 'struct clocksource *cs', which fixes compile warning for incompatible parameter type. Signed-off-by: Coly Li Cc: Johannes Weiner Cc: Ingo Molnar --- arch/xtensa/kernel/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index 8848120..9638641 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c @@ -30,7 +30,7 @@ unsigned long ccount_per_jiffy; /* per 1/HZ */ unsigned long nsec_per_ccount; /* nsec per ccount increment */ #endif -static cycle_t ccount_read(void) +static cycle_t ccount_read(struct clocksource *cs) { return (cycle_t)get_ccount(); } -- Coly Li SuSE Labs -- 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/