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-bcm-kona.c | |
| parent | 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff) | |
| parent | b526a314263ea217b8fa9758dca5dc245fd49997 (diff) | |
Merge branch 'for-4.11/core' into for-next
Diffstat (limited to 'drivers/pwm/pwm-bcm-kona.c')
| -rw-r--r-- | drivers/pwm/pwm-bcm-kona.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-bcm-kona.c b/drivers/pwm/pwm-bcm-kona.c index c63418322023..09a95aeb3a70 100644 --- a/drivers/pwm/pwm-bcm-kona.c +++ b/drivers/pwm/pwm-bcm-kona.c @@ -276,7 +276,6 @@ static int kona_pwmc_probe(struct platform_device *pdev) kp->chip.npwm = 6; kp->chip.of_xlate = of_pwm_xlate_with_flags; kp->chip.of_pwm_n_cells = 3; - kp->chip.can_sleep = true; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); kp->base = devm_ioremap_resource(&pdev->dev, res); |