diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-22 10:27:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-22 10:27:12 -0700 |
| commit | fec3c03fb07ac2acae03199fa7472a29a0d9b49d (patch) | |
| tree | d21d660aa91772a5067f2daf24b1f14ebce76176 /drivers/pwm/pwm-vt8500.c | |
| parent | f753c4ec151c5c385fa0508a29aa793dee966325 (diff) | |
| parent | b817bf5c72774556345a9043c6b0c497cdcb7295 (diff) | |
Merge tag 'for-3.6-rc3' of git://gitorious.org/linux-pwm/linux-pwm
Pull pwm fixes from Thierry Reding:
"These patches fix the Samsung PWM driver and perform some minor
cleanups like fixing checkpatch and sparse warnings.
Two redundant error messages are removed and the Kconfig help text for
the PWM subsystem is made more descriptive."
* tag 'for-3.6-rc3' of git://gitorious.org/linux-pwm/linux-pwm:
pwm: Improve Kconfig help text
pwm: core: Fix coding style issues
pwm: vt8500: Fix coding style issue
pwm: Remove a redundant error message when devm_request_and_ioremap fails
pwm: samsung: add missing device pointer to struct pwm_chip
pwm: Add missing static storage class specifiers in core.c file
Diffstat (limited to 'drivers/pwm/pwm-vt8500.c')
| -rw-r--r-- | drivers/pwm/pwm-vt8500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-vt8500.c b/drivers/pwm/pwm-vt8500.c index 548021439f0..ad14389b714 100644 --- a/drivers/pwm/pwm-vt8500.c +++ b/drivers/pwm/pwm-vt8500.c @@ -41,7 +41,7 @@ static inline void pwm_busy_wait(void __iomem *reg, u8 bitmask) cpu_relax(); if (unlikely(!loops)) - pr_warning("Waiting for status bits 0x%x to clear timed out\n", + pr_warn("Waiting for status bits 0x%x to clear timed out\n", bitmask); } |