diff options
author | Jens Axboe <axboe@fb.com> | 2017-04-24 22:03:14 -0600 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-04-24 22:03:14 -0600 |
commit | d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1 (patch) | |
tree | 9139831824ebe9cf77d1bf836b558ee2061c0483 /drivers/pwm/pwm-lpss.h | |
parent | a44f53faf4674d84cba79f7ee574584e18ab8744 (diff) | |
parent | 8f9cedc76fc7d9bc916127f8fe1287a249891d40 (diff) | |
download | linux-d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1.tar.gz |
Merge branch 'master' into for-4.12/post-merge
Diffstat (limited to 'drivers/pwm/pwm-lpss.h')
-rw-r--r-- | drivers/pwm/pwm-lpss.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pwm/pwm-lpss.h b/drivers/pwm/pwm-lpss.h index c94cd7c2695d..98306bb02cfe 100644 --- a/drivers/pwm/pwm-lpss.h +++ b/drivers/pwm/pwm-lpss.h @@ -22,6 +22,7 @@ struct pwm_lpss_boardinfo { unsigned long clk_rate; unsigned int npwm; unsigned long base_unit_bits; + bool bypass; }; struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, |