diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-02 08:05:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 08:05:45 +0100 |
| commit | 9d020d33fc1b2faa0eb35859df1381ca5dc94ffe (patch) | |
| tree | adcd4356b93b17b42c9e4ef95c3fea3afa52f3ee /drivers/pwm/pwm-lpss.h | |
| 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-lpss.h')
| -rw-r--r-- | drivers/pwm/pwm-lpss.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pwm/pwm-lpss.h b/drivers/pwm/pwm-lpss.h index 04766e0d41aa..c94cd7c2695d 100644 --- a/drivers/pwm/pwm-lpss.h +++ b/drivers/pwm/pwm-lpss.h @@ -24,10 +24,6 @@ struct pwm_lpss_boardinfo { unsigned long base_unit_bits; }; -extern const struct pwm_lpss_boardinfo pwm_lpss_byt_info; -extern const struct pwm_lpss_boardinfo pwm_lpss_bsw_info; -extern const struct pwm_lpss_boardinfo pwm_lpss_bxt_info; - struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, const struct pwm_lpss_boardinfo *info); int pwm_lpss_remove(struct pwm_lpss_chip *lpwm); |