summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/Makefile
diff options
context:
space:
mode:
authorDaniel Vetter2015-10-01 08:44:24 +0200
committerDaniel Vetter2015-10-01 08:44:24 +0200
commit8fa884dc355ffd0caa964a284a530bf747df5c77 (patch)
treec796d1d0e4b3a47f64d1b335223606a0813821ee /drivers/gpu/drm/Makefile
parentdrm/i915: Remove setparam ioctl (diff)
downloadkernel-qcow2-linux-8fa884dc355ffd0caa964a284a530bf747df5c77.tar.gz
kernel-qcow2-linux-8fa884dc355ffd0caa964a284a530bf747df5c77.tar.xz
kernel-qcow2-linux-8fa884dc355ffd0caa964a284a530bf747df5c77.zip
drm: Hack around CONFIG_AGP=m build failures
Surprisingly kbuild can't cope with tristates in the <module>-$(CONFIG_FOO) pattern. This patch hacks up a solution. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Michal Marek <mmarek@suse.com> Cc: linux-kbuild@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/Makefile')
-rw-r--r--drivers/gpu/drm/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index f458d6e33655..e814517513ce 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -21,6 +21,8 @@ drm-$(CONFIG_DRM_PANEL) += drm_panel.o
drm-$(CONFIG_OF) += drm_of.o
drm-$(CONFIG_AGP) += drm_agpsupport.o
+drm-y += $(drm-m)
+
drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \
drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o
drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o