From: Thierry Reding <thierry.reding@gmail.com> Date: Mon, 25 Jul 2016 14:23:39 +0000 (+0200) Subject: Merge branch 'for-4.8/capture' into for-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd2686122d3b45db1398776921bd47fedfd6d6a5;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-4.8/capture' into for-next --- bd2686122d3b45db1398776921bd47fedfd6d6a5 diff --cc include/linux/pwm.h index 47e66bfb8cb4,8402b5dd3e06..f1bbae014889 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@@ -411,7 -335,10 +426,9 @@@ static inline void pwm_disable(struct p pwm_apply_state(pwm, &state); } - /* PWM provider APIs */ + int pwm_capture(struct pwm_device *pwm, struct pwm_capture *result, + unsigned long timeout); int pwm_set_chip_data(struct pwm_device *pwm, void *data); void *pwm_get_chip_data(struct pwm_device *pwm);