git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-3.8-rc1' of git://gitorious.org/linux-pwm/linux-pwm
[pandora-kernel.git]
/
drivers
/
pwm
/
pwm-samsung.c
diff --git
a/drivers/pwm/pwm-samsung.c
b/drivers/pwm/pwm-samsung.c
index
e9b15d0
..
5207e6c
100644
(file)
--- a/
drivers/pwm/pwm-samsung.c
+++ b/
drivers/pwm/pwm-samsung.c
@@
-222,6
+222,7
@@
static int s3c_pwm_probe(struct platform_device *pdev)
/* calculate base of control bits in TCON */
s3c->tcon_base = id == 0 ? 0 : (id * 4) + 4;
+ s3c->pwm_id = id;
s3c->chip.dev = &pdev->dev;
s3c->chip.ops = &s3c_pwm_ops;
s3c->chip.base = -1;