diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-17 09:29:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-17 09:29:03 -0400 |
| commit | 11cd4cb5f55cdc2f487b8c714610aa3538e28103 (patch) | |
| tree | 81376ff23d9a706c3d4f45e5cf4d213e63abd2ed /arch/arm/plat-s3c24xx/pwm.c | |
| parent | 485bdde78747f7ce2af164406c32db23e4688925 (diff) | |
| parent | 55b404fd78792d7a88d19f2534510ee42841146f (diff) | |
Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/plat-s3c24xx/pwm.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/pwm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c index feb770f2e84e..ec56b88866c4 100644 --- a/arch/arm/plat-s3c24xx/pwm.c +++ b/arch/arm/plat-s3c24xx/pwm.c | |||
| @@ -56,7 +56,7 @@ static struct clk *clk_scaler[2]; | |||
| 56 | } \ | 56 | } \ |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | #define DEFINE_TIMER(_tmr_no, _irq) \ | 59 | #define DEFINE_S3C_TIMER(_tmr_no, _irq) \ |
| 60 | .name = "s3c24xx-pwm", \ | 60 | .name = "s3c24xx-pwm", \ |
| 61 | .id = _tmr_no, \ | 61 | .id = _tmr_no, \ |
| 62 | .num_resources = TIMER_RESOURCE_SIZE, \ | 62 | .num_resources = TIMER_RESOURCE_SIZE, \ |
| @@ -67,11 +67,11 @@ static struct clk *clk_scaler[2]; | |||
| 67 | */ | 67 | */ |
| 68 | 68 | ||
| 69 | struct platform_device s3c_device_timer[] = { | 69 | struct platform_device s3c_device_timer[] = { |
| 70 | [0] = { DEFINE_TIMER(0, IRQ_TIMER0) }, | 70 | [0] = { DEFINE_S3C_TIMER(0, IRQ_TIMER0) }, |
| 71 | [1] = { DEFINE_TIMER(1, IRQ_TIMER1) }, | 71 | [1] = { DEFINE_S3C_TIMER(1, IRQ_TIMER1) }, |
| 72 | [2] = { DEFINE_TIMER(2, IRQ_TIMER2) }, | 72 | [2] = { DEFINE_S3C_TIMER(2, IRQ_TIMER2) }, |
| 73 | [3] = { DEFINE_TIMER(3, IRQ_TIMER3) }, | 73 | [3] = { DEFINE_S3C_TIMER(3, IRQ_TIMER3) }, |
| 74 | [4] = { DEFINE_TIMER(4, IRQ_TIMER4) }, | 74 | [4] = { DEFINE_S3C_TIMER(4, IRQ_TIMER4) }, |
| 75 | }; | 75 | }; |
| 76 | 76 | ||
| 77 | static inline int pwm_is_tdiv(struct pwm_device *pwm) | 77 | static inline int pwm_is_tdiv(struct pwm_device *pwm) |