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

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

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index fda44679dffc..808e0ae66aa8 100644
--- 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/