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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/omap2/dss/Makefile b/drivers/video/fbdev/omap2/dss/Makefile index 2ea9d38..b5136d3 100644 --- a/drivers/video/fbdev/omap2/dss/Makefile +++ b/drivers/video/fbdev/omap2/dss/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o obj-$(CONFIG_OMAP2_DSS) += omapdss.o # Core DSS files omapdss-y := core.o dss.o dss_features.o dispc.o dispc_coefs.o display.o \ - output.o dss-of.o pll.o + output.o dss-of.o pll.o video-pll.o # DSS compat layer files omapdss-y += manager.o manager-sysfs.o overlay.o overlay-sysfs.o apply.o \ dispc-compat.o display-sysfs.o |