redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[ARM] S3C24XX: Fix redefine of DEFINE_TIMER() in s3c24xx pwm-clock.c

Browse source 
Do not redefine the DEFINE_TIMER macro. Renamed the local macro
to DEFINE_S3C_TIMER.

Signed-off-by: Nelson Castillo <nelsoneci@gmail.com>
[ben-linux@fluff.org: spelling and subject fix]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Nelson Castillo 2008-10-16 16:46:10 +01:00 committed by Ben Dooks
parent 5c37866c6e
commit 55b404fd78
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/plat-s3c24xx/pwm.c
View file

@ -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", \ .name = "s3c24xx-pwm", \
.id = _tmr_no, \ .id = _tmr_no, \
.num_resources = TIMER_RESOURCE_SIZE, \ .num_resources = TIMER_RESOURCE_SIZE, \
@ -67,11 +67,11 @@ static struct clk *clk_scaler[2];
*/ */
struct platform_device s3c_device_timer[] = { struct platform_device s3c_device_timer[] = {
[0] = { DEFINE_TIMER(0, IRQ_TIMER0) }, [0] = { DEFINE_S3C_TIMER(0, IRQ_TIMER0) },
[1] = { DEFINE_TIMER(1, IRQ_TIMER1) }, [1] = { DEFINE_S3C_TIMER(1, IRQ_TIMER1) },
[2] = { DEFINE_TIMER(2, IRQ_TIMER2) }, [2] = { DEFINE_S3C_TIMER(2, IRQ_TIMER2) },
[3] = { DEFINE_TIMER(3, IRQ_TIMER3) }, [3] = { DEFINE_S3C_TIMER(3, IRQ_TIMER3) },
[4] = { DEFINE_TIMER(4, IRQ_TIMER4) }, [4] = { DEFINE_S3C_TIMER(4, IRQ_TIMER4) },
}; };
static inline int pwm_is_tdiv(struct pwm_device *pwm) static inline int pwm_is_tdiv(struct pwm_device *pwm)