diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-26 23:16:39 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-26 23:16:45 +0100 |
| commit | 9abc6461a3802702ada88cbac1fed045dbd9b466 (patch) | |
| tree | 5d377876a0fb5249902912fd4d1b71a10ba9907b /arch/arm/plat-s3c24xx/pwm.c | |
| parent | f8787fdcf6f46d6a65a42dbddb70cd7e4dc5b741 (diff) | |
| parent | 78af47353065ea776d537f6e8b32c7c15b6ea169 (diff) | |
Merge branch 's3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux.git
Diffstat (limited to 'arch/arm/plat-s3c24xx/pwm.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/pwm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c index 18c4bdc49a0..7a92c938542 100644 --- a/arch/arm/plat-s3c24xx/pwm.c +++ b/arch/arm/plat-s3c24xx/pwm.c @@ -19,6 +19,7 @@ #include <linux/io.h> #include <linux/pwm.h> +#include <asm/plat-s3c24xx/devs.h> #include <asm/plat-s3c/regs-timer.h> struct pwm_device { @@ -38,7 +39,7 @@ struct pwm_device { unsigned char pwm_id; }; -#define pwm_dbg(_pwm, msg...) dev_info(&(_pwm)->pdev->dev, msg) +#define pwm_dbg(_pwm, msg...) dev_dbg(&(_pwm)->pdev->dev, msg) static struct clk *clk_scaler[2]; @@ -168,7 +169,7 @@ void pwm_disable(struct pwm_device *pwm) EXPORT_SYMBOL(pwm_disable); -unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq) +static unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq) { unsigned long tin_parent_rate; unsigned int div; |