From 9960aa7cb58caadef8edf3a2582e30664a6b68dd Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 9 Dec 2015 20:26:00 +0200 Subject: drm/omap: move omapdss & displays under omapdrm Now that omapfb has its own copy of omapdss and display drivers, we can move omapdss and display drivers which omapdrm uses to omapdrm's directory. We also need to change the main drm Makefile so that omapdrm directory is always entered, because omapdss has a file that can't be built as a module. Signed-off-by: Tomi Valkeinen Acked-by: Dave Airlie Acked-by: Rob Clark --- drivers/gpu/drm/omapdrm/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/gpu/drm/omapdrm/Makefile') diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile index 778372b062ad..d48d97f80e8c 100644 --- a/drivers/gpu/drm/omapdrm/Makefile +++ b/drivers/gpu/drm/omapdrm/Makefile @@ -3,6 +3,9 @@ # Direct Rendering Infrastructure (DRI) # +obj-y += dss/ +obj-y += displays/ + ccflags-y := -Iinclude/drm -Werror omapdrm-y := omap_drv.o \ omap_irq.o \ -- cgit v1.2.3-59-g8ed1b