[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <49EF6A9E.6080605@suse.de>
Date: Thu, 23 Apr 2009 03:06:06 +0800
From: Coly Li <coly.li@...e.de>
To: LKML <linux-kernel@...r.kernel.org>
Cc: David Daney <ddaney@...iumnetworks.com>,
Ingo Molnar <mingo@...e.hu>
Subject: [PATCH 5/7] mips cavium-octeon: add parameter to octeon_cvmcount_read()
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 <coly.li@...e.de>
Cc: David Daney <ddaney@...iumnetworks.com>
Cc: Ingo Molnar <mingo@...e.hu>
---
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists