aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcmring
diff options
context:
space:
mode:
authorLeo Chen <leochen@broadcom.com>2009-10-06 19:30:40 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-10-07 13:13:01 +0100
commitb623438341b40ee78bdab7ab509889de519af2e7 (patch)
treeb4ac8a681bcfdcb69ab950e342b4d8d396bebb5e /arch/arm/mach-bcmring
parent3257f43d9296ed7adcc84e48f6ddf5313cf29266 (diff)
downloadkernel_samsung_smdk4412-b623438341b40ee78bdab7ab509889de519af2e7.zip
kernel_samsung_smdk4412-b623438341b40ee78bdab7ab509889de519af2e7.tar.gz
kernel_samsung_smdk4412-b623438341b40ee78bdab7ab509889de519af2e7.tar.bz2
ARM: 5748/1: bcmring: fix build warning messages
Fix the warning messages during kernel build for bcmring. Signed-off-by: Leo Hao Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-bcmring')
-rw-r--r--arch/arm/mach-bcmring/core.c4
-rw-r--r--arch/arm/mach-bcmring/include/mach/system.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c
index 4b4f692..e590bbe 100644
--- a/arch/arm/mach-bcmring/core.c
+++ b/arch/arm/mach-bcmring/core.c
@@ -271,12 +271,12 @@ static struct irqaction bcmring_timer_irq = {
.handler = bcmring_timer_interrupt,
};
-static cycle_t bcmring_get_cycles_timer1(void)
+static cycle_t bcmring_get_cycles_timer1(struct clocksource *cs)
{
return ~readl(TIMER1_VA_BASE + TIMER_VALUE);
}
-static cycle_t bcmring_get_cycles_timer3(void)
+static cycle_t bcmring_get_cycles_timer3(struct clocksource *cs)
{
return ~readl(TIMER3_VA_BASE + TIMER_VALUE);
}
diff --git a/arch/arm/mach-bcmring/include/mach/system.h b/arch/arm/mach-bcmring/include/mach/system.h
index cdbf93c..38b3706 100644
--- a/arch/arm/mach-bcmring/include/mach/system.h
+++ b/arch/arm/mach-bcmring/include/mach/system.h
@@ -29,7 +29,7 @@ static inline void arch_idle(void)
cpu_do_idle();
}
-static inline void arch_reset(char mode, char *cmd)
+static inline void arch_reset(char mode, const char *cmd)
{
printk("arch_reset:%c %x\n", mode, bcmring_arch_warm_reboot);