diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
| commit | 75d8f2931a803b803cb4a850448460475c20f30b (patch) | |
| tree | 9853b9084fa55609c8e4abbc1763bc500e05da50 /drivers/pwm/pwm-samsung.c | |
| parent | ffb690d5aa36d38d7bed7579e3f07b84ff6b3a08 (diff) | |
| parent | e93c7d1bc350189511d32cec2f0af79c30e7fa47 (diff) | |
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'drivers/pwm/pwm-samsung.c')
| -rw-r--r-- | drivers/pwm/pwm-samsung.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c index d10386528c9c..e5187c0ade9f 100644 --- a/drivers/pwm/pwm-samsung.c +++ b/drivers/pwm/pwm-samsung.c | |||
| @@ -225,6 +225,7 @@ static int s3c_pwm_probe(struct platform_device *pdev) | |||
| 225 | 225 | ||
| 226 | /* calculate base of control bits in TCON */ | 226 | /* calculate base of control bits in TCON */ |
| 227 | s3c->tcon_base = id == 0 ? 0 : (id * 4) + 4; | 227 | s3c->tcon_base = id == 0 ? 0 : (id * 4) + 4; |
| 228 | s3c->chip.dev = &pdev->dev; | ||
| 228 | s3c->chip.ops = &s3c_pwm_ops; | 229 | s3c->chip.ops = &s3c_pwm_ops; |
| 229 | s3c->chip.base = -1; | 230 | s3c->chip.base = -1; |
| 230 | s3c->chip.npwm = 1; | 231 | s3c->chip.npwm = 1; |