diff options
| author |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-02-04 12:44:11 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-02-04 12:44:11 +0200 |
| commit | d6c2152b3efd73be265f426b5a1bb50ec436d999 (patch) | |
| tree | f35b2a9b40c82028a4a2ecd4593d592431db8fc2 /drivers/video/fbdev/omap2/dss/hdmi5.c | |
| parent | video: fbdev: fix sys_copyarea (diff) | |
| parent | omapfb: Return error code when applying overlay settings fails (diff) | |
| download | linux-dev-d6c2152b3efd73be265f426b5a1bb50ec436d999.tar.xz linux-dev-d6c2152b3efd73be265f426b5a1bb50ec436d999.zip | |
Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next
Merge fbdev topic branches
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/hdmi5.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/hdmi5.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index 39aae3aa7136..3f0b34a7031a 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c @@ -787,6 +787,7 @@ static const struct dev_pm_ops hdmi_pm_ops = { static const struct of_device_id hdmi_of_match[] = { { .compatible = "ti,omap5-hdmi", }, + { .compatible = "ti,dra7-hdmi", }, {}, }; |