diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-02 02:05:45 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 02:05:45 -0500 |
| commit | 9d020d33fc1b2faa0eb35859df1381ca5dc94ffe (patch) | |
| tree | adcd4356b93b17b42c9e4ef95c3fea3afa52f3ee /drivers/pwm/pwm-atmel.c | |
| parent | 6b0b7551428e4caae1e2c023a529465a9a9ae2d4 (diff) | |
| parent | 4977ab6e92e267afe9d8f78438c3db330ca8434c (diff) | |
Merge branch 'linus' into perf/urgent, to resolve conflict
Conflicts:
arch/powerpc/configs/85xx/kmp204x_defconfig
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pwm/pwm-atmel.c')
| -rw-r--r-- | drivers/pwm/pwm-atmel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c index e6b8b1b7e6ba..67a7023be5c2 100644 --- a/drivers/pwm/pwm-atmel.c +++ b/drivers/pwm/pwm-atmel.c | |||
| @@ -385,7 +385,6 @@ static int atmel_pwm_probe(struct platform_device *pdev) | |||
| 385 | 385 | ||
| 386 | atmel_pwm->chip.base = -1; | 386 | atmel_pwm->chip.base = -1; |
| 387 | atmel_pwm->chip.npwm = 4; | 387 | atmel_pwm->chip.npwm = 4; |
| 388 | atmel_pwm->chip.can_sleep = true; | ||
| 389 | atmel_pwm->config = data->config; | 388 | atmel_pwm->config = data->config; |
| 390 | atmel_pwm->updated_pwms = 0; | 389 | atmel_pwm->updated_pwms = 0; |
| 391 | mutex_init(&atmel_pwm->isr_lock); | 390 | mutex_init(&atmel_pwm->isr_lock); |