gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.

Signed-off-by: Dave Airlie <airlied@linux.ie>

diff --git a/drivers/Makefile b/drivers/Makefile
index fda44679dffc72ebb05f3241e8780eb86cf56b97..808e0ae66aa80cfeead838ea27731457177a22a7 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -10,7 +10,6 @@ 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/