Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55b404fd authored by Nelson Castillo's avatar Nelson Castillo Committed by Ben Dooks
Browse files

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



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

Signed-off-by: default avatarNelson Castillo <nelsoneci@gmail.com>
[ben-linux@fluff.org: spelling and subject fix]
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 5c37866c

arch/arm/plat-s3c24xx/pwm.c

+6 −6
Original line number Diff line number Diff line
@@ -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)