Merge drm/drm-next into drm-misc-next

danvet needs a backmerge to ease the upcoming drmP.h rework

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
This commit is contained in:
Maxime Ripard 2019-01-24 11:03:16 +01:00
commit d2c20b5d37
No known key found for this signature in database
GPG key ID: E3EF0D6F671851C5
159 changed files with 3169 additions and 3550 deletions

View file

@ -26,4 +26,7 @@ struct intel_soc_pmic {
struct device *dev;
};
int intel_soc_pmic_exec_mipi_pmic_seq_element(u16 i2c_address, u32 reg_address,
u32 value, u32 mask);
#endif /* __INTEL_SOC_PMIC_H__ */