diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2017-02-10 15:15:54 +0100 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2017-02-10 15:15:54 +0100 |
| commit | 652f319667383f2b2c62dda7841265bedd89c5a3 (patch) | |
| tree | 33bc36f29bee3acf277fded5b5d30513d16bfd53 /drivers/pwm/pwm-sti.c | |
| parent | 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff) | |
| parent | b526a314263ea217b8fa9758dca5dc245fd49997 (diff) | |
Merge branch 'for-4.11/core' into for-next
Diffstat (limited to 'drivers/pwm/pwm-sti.c')
| -rw-r--r-- | drivers/pwm/pwm-sti.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index dd82dc840af9..2b7c31c9d1ab 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -635,7 +635,6 @@ skip_cpt: pc->chip.ops = &sti_pwm_ops; pc->chip.base = -1; pc->chip.npwm = pc->cdata->pwm_num_devs; - pc->chip.can_sleep = true; ret = pwmchip_add(&pc->chip); if (ret < 0) { |