Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index f65deda..808e0ae 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -22,6 +22,9 @@ obj-$(CONFIG_XEN)             += xen/
 # default.
 obj-y                          += char/
 
+# gpu/ comes after char for AGP vs DRM startup
+obj-y                          += gpu/
+
 obj-$(CONFIG_CONNECTOR)                += connector/
 
 # i810fb and intelfb depend on char/agp/