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 /include | |
| parent | ee06bd155b081a1895f995ec2777094c7e746152 (diff) | |
| parent | 811fbb1f580ca024a0af603dfaef08a4d1dcb5ef (diff) | |
| download | linux-d6c2152b3efd73be265f426b5a1bb50ec436d999.tar.gz linux-d6c2152b3efd73be265f426b5a1bb50ec436d999.tar.bz2 linux-d6c2152b3efd73be265f426b5a1bb50ec436d999.zip | |
Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next
Merge fbdev topic branches
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/omapdss.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 6a84498ea513..60de61fea8e3 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -314,6 +314,7 @@ enum omapdss_version { OMAPDSS_VER_OMAP4, /* All other OMAP4s */ OMAPDSS_VER_OMAP5, OMAPDSS_VER_AM43xx, + OMAPDSS_VER_DRA7xx, }; /* Board specific data */ |