diff options
author | Dave Airlie | 2017-02-24 08:29:03 +1000 |
---|---|---|
committer | Dave Airlie | 2017-02-24 08:29:03 +1000 |
commit | 894ebc414d4688da732a185954ca23c5d11900d0 (patch) | |
tree | fc5a26e416221660881ff1bd1960198dd2ec2f07 /include/drm | |
parent | 84f7174b4f793898aaeec0213c6c69ad300f4bc4 (diff) | |
parent | eaeebffa90f35e0f92658249b0e5c49ddfa89915 (diff) |
Merge tag 'drm/panel/for-4.11-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/panel: Changes for v4.11-rc1
This set contains a couple of cleanups as well as support for a few more
simple panels.
* tag 'drm/panel/for-4.11-rc1' of git://anongit.freedesktop.org/tegra/linux:
drm/panel: simple: Specify bus width and flags for EDT displays
drm/panel: simple: Add Netron DY E231732
of: Add vendor prefix for Netron DY
drm/panel: simple: Add support for Tianma TM070JDHG30
of: Add vendor prefix for Tianma Micro-electronics
drm/panel: simple: Add support BOE NV101WXMN51
dt-bindings: display: Add BOE NV101WXMN51 panel binding
drm/panel: Constify device node argument to of_drm_find_panel()
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_panel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h index 220d1e2b3db1..4b76cf2d5a7b 100644 --- a/include/drm/drm_panel.h +++ b/include/drm/drm_panel.h @@ -193,9 +193,9 @@ int drm_panel_attach(struct drm_panel *panel, struct drm_connector *connector); int drm_panel_detach(struct drm_panel *panel); #ifdef CONFIG_OF -struct drm_panel *of_drm_find_panel(struct device_node *np); +struct drm_panel *of_drm_find_panel(const struct device_node *np); #else -static inline struct drm_panel *of_drm_find_panel(struct device_node *np) +static inline struct drm_panel *of_drm_find_panel(const struct device_node *np) { return NULL; } |