diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-02-04 10:44:11 (GMT) |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-02-04 10:44:11 (GMT) |
| commit | d6c2152b3efd73be265f426b5a1bb50ec436d999 (patch) | |
| tree | f35b2a9b40c82028a4a2ecd4593d592431db8fc2 /drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | |
| parent | ee06bd155b081a1895f995ec2777094c7e746152 (diff) | |
| parent | 811fbb1f580ca024a0af603dfaef08a4d1dcb5ef (diff) | |
| download | linux-d6c2152b3efd73be265f426b5a1bb50ec436d999.tar.xz | |
Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next
Merge fbdev topic branches
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/omapdss-boot-init.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c index 2f0822e..42b87f9 100644 --- a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c +++ b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c @@ -186,6 +186,7 @@ static const struct of_device_id omapdss_of_match[] __initconst = { { .compatible = "ti,omap3-dss", }, { .compatible = "ti,omap4-dss", }, { .compatible = "ti,omap5-dss", }, + { .compatible = "ti,dra7-dss", }, {}, }; |