Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[~andy/linux] / drivers / gpu / Makefile

diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 30879df3daead6c3e208cfed0e8e7d191d31eaa9..cc9277885dd071b2da83edeae9250b6ea5985020 100644 (file)
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1 +1 @@
-obj-y                  += drm/ vga/
+obj-y                  += drm/ vga/ stub/