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-pxa.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-pxa.c')
| -rw-r--r-- | drivers/pwm/pwm-pxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index 58b709f29130..4143a46684d2 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c | |||
| @@ -118,7 +118,7 @@ static void pxa_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) | |||
| 118 | clk_disable_unprepare(pc->clk); | 118 | clk_disable_unprepare(pc->clk); |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | static struct pwm_ops pxa_pwm_ops = { | 121 | static const struct pwm_ops pxa_pwm_ops = { |
| 122 | .config = pxa_pwm_config, | 122 | .config = pxa_pwm_config, |
| 123 | .enable = pxa_pwm_enable, | 123 | .enable = pxa_pwm_enable, |
| 124 | .disable = pxa_pwm_disable, | 124 | .disable = pxa_pwm_disable, |