X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2FMakefile;h=54ec5e718c0e32296ea0c78e515930713f05c811;hb=3f07af494dfa6de43137dae430431c9fbf929c0c;hp=f65deda72d6102636e47554c9864d529df27a258;hpb=2c4aabcca847ac4c92aa5e960c3f6053e1051b62;p=linux-2.6

diff --git a/drivers/Makefile b/drivers/Makefile
index f65deda72d..54ec5e718c 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -5,7 +5,7 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-obj-$(CONFIG_HAVE_GPIO_LIB)	+= gpio/
+obj-y				+= gpio/
 obj-$(CONFIG_PCI)		+= pci/
 obj-$(CONFIG_PARISC)		+= parisc/
 obj-$(CONFIG_RAPIDIO)		+= rapidio/
@@ -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/