diff options
| author | Thierry Reding <[email protected]> | 2017-02-10 14:15:54 +0000 |
|---|---|---|
| committer | Thierry Reding <[email protected]> | 2017-02-10 14:15:54 +0000 |
| commit | 652f319667383f2b2c62dda7841265bedd89c5a3 (patch) | |
| tree | 33bc36f29bee3acf277fded5b5d30513d16bfd53 /drivers/pwm/pwm-imx.c | |
| parent | Linux 4.10-rc2 (diff) | |
| parent | pwm: Try to load modules during pwm_get() (diff) | |
| download | kernel-652f319667383f2b2c62dda7841265bedd89c5a3.tar.gz kernel-652f319667383f2b2c62dda7841265bedd89c5a3.zip | |
Merge branch 'for-4.11/core' into for-next
Diffstat (limited to 'drivers/pwm/pwm-imx.c')
| -rw-r--r-- | drivers/pwm/pwm-imx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index d600fd5cd4ba..1223187ad354 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -304,7 +304,6 @@ static int imx_pwm_probe(struct platform_device *pdev) imx->chip.dev = &pdev->dev; imx->chip.base = -1; imx->chip.npwm = 1; - imx->chip.can_sleep = true; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); imx->mmio_base = devm_ioremap_resource(&pdev->dev, r); |