Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-uclogic...

[deliverable/linux.git] / drivers / gpu / Makefile

diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 70da9eb52a42cb623c887ca91e31fa250f8fd33f..e9ed439a5b65329c33f450a1c82e78290581783a 100644 (file)
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1,3 +1,6 @@
-obj-y                  += drm/ vga/
+# drm/tegra depends on host1x, so if both drivers are built-in care must be
+# taken to initialize them in the correct order. Link order is the only way
+# to ensure this currently.
 obj-$(CONFIG_TEGRA_HOST1X)     += host1x/
+obj-y                  += drm/ vga/
 obj-$(CONFIG_IMX_IPUV3_CORE)   += ipu-v3/