From a590cf1dc209c4e176b8dcf2a1f3801640b2d0fe Mon Sep 17 00:00:00 2001 From: Jamie Iles Date: Mon, 25 Jul 2011 16:34:37 +0100 Subject: [PATCH] --- yaml --- r: 269202 b: refs/heads/master c: a1330228f9eec7e355d41f45c17e1297d681f40d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/clocksource/dw_apb_timer.c | 2 +- trunk/include/linux/dw_apb_timer.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 92c5477d4689..9d73a299c614 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcb69290af30f7ef54e03bf82e1be0950f167789 +refs/heads/master: a1330228f9eec7e355d41f45c17e1297d681f40d diff --git a/trunk/drivers/clocksource/dw_apb_timer.c b/trunk/drivers/clocksource/dw_apb_timer.c index 580f870541a3..8c2a35f26d9b 100644 --- a/trunk/drivers/clocksource/dw_apb_timer.c +++ b/trunk/drivers/clocksource/dw_apb_timer.c @@ -348,7 +348,7 @@ static void apbt_restart_clocksource(struct clocksource *cs) * dw_apb_clocksource_register() as the next step. */ struct dw_apb_clocksource * -dw_apb_clocksource_init(unsigned rating, char *name, void __iomem *base, +dw_apb_clocksource_init(unsigned rating, const char *name, void __iomem *base, unsigned long freq) { struct dw_apb_clocksource *dw_cs = kzalloc(sizeof(*dw_cs), GFP_KERNEL); diff --git a/trunk/include/linux/dw_apb_timer.h b/trunk/include/linux/dw_apb_timer.h index 49638ea3b776..07261d52a6df 100644 --- a/trunk/include/linux/dw_apb_timer.h +++ b/trunk/include/linux/dw_apb_timer.h @@ -46,7 +46,7 @@ struct dw_apb_clock_event_device * dw_apb_clockevent_init(int cpu, const char *name, unsigned rating, void __iomem *base, int irq, unsigned long freq); struct dw_apb_clocksource * -dw_apb_clocksource_init(unsigned rating, char *name, void __iomem *base, +dw_apb_clocksource_init(unsigned rating, const char *name, void __iomem *base, unsigned long freq); void dw_apb_clocksource_register(struct dw_apb_clocksource *dw_cs); void dw_apb_clocksource_start(struct dw_apb_clocksource *dw_cs);