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-bfin.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-bfin.c')
| -rw-r--r-- | drivers/pwm/pwm-bfin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-bfin.c b/drivers/pwm/pwm-bfin.c index 7631ef194de7..d2ed0a2a18e8 100644 --- a/drivers/pwm/pwm-bfin.c +++ b/drivers/pwm/pwm-bfin.c | |||
| @@ -103,7 +103,7 @@ static void bfin_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) | |||
| 103 | disable_gptimer(priv->pin); | 103 | disable_gptimer(priv->pin); |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | static struct pwm_ops bfin_pwm_ops = { | 106 | static const struct pwm_ops bfin_pwm_ops = { |
| 107 | .request = bfin_pwm_request, | 107 | .request = bfin_pwm_request, |
| 108 | .free = bfin_pwm_free, | 108 | .free = bfin_pwm_free, |
| 109 | .config = bfin_pwm_config, | 109 | .config = bfin_pwm_config, |