From 88a1c22cb3285f0ffe3b727d1d2a0a6d2a6b1a16 Mon Sep 17 00:00:00 2001 From: Nelson Castillo Date: Thu, 16 Oct 2008 16:46:10 +0100 Subject: [PATCH] --- yaml --- r: 116815 b: refs/heads/master c: 55b404fd78792d7a88d19f2534510ee42841146f h: refs/heads/master i: 116813: 0f144a329f49eea16a3452c8e1b0d6fcea9cb5ed 116811: 749c83bfe48641490ccdd8ff5a778949998fe2d4 116807: 82fcc908a1d445022a2a52563f978830526fde00 116799: 8d3ea714a0e1029902270e903268a2c2ed023732 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c24xx/pwm.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 14d93bb93a44..04de62f5c5df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c37866c6e2f0d19896e4c14f386189c1fdf2295 +refs/heads/master: 55b404fd78792d7a88d19f2534510ee42841146f diff --git a/trunk/arch/arm/plat-s3c24xx/pwm.c b/trunk/arch/arm/plat-s3c24xx/pwm.c index 7a92c938542a..cbc06067d9ce 100644 --- a/trunk/arch/arm/plat-s3c24xx/pwm.c +++ b/trunk/arch/arm/plat-s3c24xx/pwm.c @@ -56,7 +56,7 @@ static struct clk *clk_scaler[2]; } \ } -#define DEFINE_TIMER(_tmr_no, _irq) \ +#define DEFINE_S3C_TIMER(_tmr_no, _irq) \ .name = "s3c24xx-pwm", \ .id = _tmr_no, \ .num_resources = TIMER_RESOURCE_SIZE, \ @@ -67,11 +67,11 @@ static struct clk *clk_scaler[2]; */ struct platform_device s3c_device_timer[] = { - [0] = { DEFINE_TIMER(0, IRQ_TIMER0) }, - [1] = { DEFINE_TIMER(1, IRQ_TIMER1) }, - [2] = { DEFINE_TIMER(2, IRQ_TIMER2) }, - [3] = { DEFINE_TIMER(3, IRQ_TIMER3) }, - [4] = { DEFINE_TIMER(4, IRQ_TIMER4) }, + [0] = { DEFINE_S3C_TIMER(0, IRQ_TIMER0) }, + [1] = { DEFINE_S3C_TIMER(1, IRQ_TIMER1) }, + [2] = { DEFINE_S3C_TIMER(2, IRQ_TIMER2) }, + [3] = { DEFINE_S3C_TIMER(3, IRQ_TIMER3) }, + [4] = { DEFINE_S3C_TIMER(4, IRQ_TIMER4) }, }; static inline int pwm_is_tdiv(struct pwm_device *pwm)