Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756722AbZDVTF7 (ORCPT ); Wed, 22 Apr 2009 15:05:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756113AbZDVTFm (ORCPT ); Wed, 22 Apr 2009 15:05:42 -0400 Received: from cantor2.suse.de ([195.135.220.15]:51308 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756514AbZDVTFl (ORCPT ); Wed, 22 Apr 2009 15:05:41 -0400 Message-ID: <49EF6A9E.6080605@suse.de> Date: Thu, 23 Apr 2009 03:06:06 +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: David Daney , Ingo Molnar Subject: [PATCH 5/7] mips cavium-octeon: add parameter to octeon_cvmcount_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: 1081 Lines: 36 This patch modifies parameter of octeon_cvmcount_read() from 'void' to 'struct clocksource *cs', which fixes compile warning for incompatible parameter type. Signed-off-by: Coly Li Cc: David Daney Cc: Ingo Molnar --- arch/mips/cavium-octeon/csrc-octeon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c index 70fd92c..96110f2 100644 --- a/arch/mips/cavium-octeon/csrc-octeon.c +++ b/arch/mips/cavium-octeon/csrc-octeon.c @@ -38,7 +38,7 @@ void octeon_init_cvmcount(void) local_irq_restore(flags); } -static cycle_t octeon_cvmcount_read(void) +static cycle_t octeon_cvmcount_read(struct clocksource *cs) { return read_c0_cvmcount(); } -- 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/