aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5p
diff options
context:
space:
mode:
authorChoi jonghwan <jhbird.choi@samsung.com>2010-09-28 00:56:54 -0700
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:47:04 -0800
commit61ece13ecbb526ebfae6dbbb65885ec78c77bfcb (patch)
tree07bc82e8a03fd1d8f4f2b01fb9cd41413d094282 /arch/arm/plat-s5p
parent17cfe63a324818c8921b7969e143853c7c18145c (diff)
downloadkernel_samsung_crespo-61ece13ecbb526ebfae6dbbb65885ec78c77bfcb.zip
kernel_samsung_crespo-61ece13ecbb526ebfae6dbbb65885ec78c77bfcb.tar.gz
kernel_samsung_crespo-61ece13ecbb526ebfae6dbbb65885ec78c77bfcb.tar.bz2
S5PC11X; HRTIMER: Fix compile warnning.
Fix compile warnning. Change-Id: I540555c72899f1a2cafec0c2e418972409c6e467 Signed-off-by: Choi jonghwan <jhbird.choi@samsung.com>
Diffstat (limited to 'arch/arm/plat-s5p')
-rw-r--r--arch/arm/plat-s5p/hr-time-rtc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-s5p/hr-time-rtc.c b/arch/arm/plat-s5p/hr-time-rtc.c
index fb1b8ba..f104b7c 100644
--- a/arch/arm/plat-s5p/hr-time-rtc.c
+++ b/arch/arm/plat-s5p/hr-time-rtc.c
@@ -272,7 +272,7 @@ static struct clock_event_device clockevent_tick_timer = {
.set_mode = s5p_tick_set_mode,
};
-irqreturn_t s5p_tick_timer_interrupt(int irq, void *dev_id)
+static irqreturn_t s5p_tick_timer_interrupt(int irq, void *dev_id)
{
struct clock_event_device *evt = &clockevent_tick_timer;
@@ -350,7 +350,7 @@ struct irqaction s5p_systimer_irq = {
};
-static cycle_t s5p_sched_timer_read(void)
+static cycle_t s5p_sched_timer_read(struct clocksource *cs)
{
return (cycle_t)~__raw_readl(S5P_SYSTIMER_TICNTO);
@@ -394,7 +394,7 @@ unsigned long long sched_clock(void)
if (likely(sched_timer_running)) {
overflow_cnt = (s5p_sched_timer_overflows - old_overflows);
- ticks = s5p_sched_timer_read();
+ ticks = s5p_sched_timer_read(&clocksource_s5p);
if (overflow_cnt) {
increment = (overflow_cnt - 1) *