summaryrefslogtreecommitdiff
path: root/arch/arm/plat-s3c24xx/pwm.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-19 11:15:50 +0400
committerIngo Molnar <mingo@elte.hu>2008-09-19 11:15:50 +0400
commit5e51900be6c15488b80343d3c3e62d4d605ba9a9 (patch)
tree99e60bbc949e066503b598893998286c8a42861d /arch/arm/plat-s3c24xx/pwm.c
parent998564789137921acae9e367b61c5a1dc295653d (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
downloadlinux-5e51900be6c15488b80343d3c3e62d4d605ba9a9.tar.xz
Merge commit 'v2.6.27-rc6' into x86/cleanups
Diffstat (limited to 'arch/arm/plat-s3c24xx/pwm.c')
-rw-r--r--arch/arm/plat-s3c24xx/pwm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c
index 18c4bdc49a05..7a92c938542a 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;