X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2FMakefile;h=54ec5e718c0e32296ea0c78e515930713f05c811;hb=50cb993ea6cd187bfed085cb3e0747066edeb02f;hp=fda44679dffc72ebb05f3241e8780eb86cf56b97;hpb=948769a5ba304ed3329a2f42ee3561f04a0b5692;p=linux-2.6

diff --git a/drivers/Makefile b/drivers/Makefile
index fda44679df..54ec5e718c 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -5,12 +5,11 @@
 # 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/
 obj-y				+= video/
-obj-y				+= gpu/
 obj-$(CONFIG_ACPI)		+= acpi/
 # PnP must come after ACPI since it will eventually need to check if acpi
 # was used and do nothing if so
@@ -23,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/