From: Dave Airlie <airlied@redhat.com>
Date: Sun, 20 Jul 2008 22:42:36 +0000 (+1000)
Subject: gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.
X-Git-Tag: v2.6.27-rc1~962^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6b51632b3579d96ce5aa1b3efdeceedd2921a2c;p=linux-2.6

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 fda44679df..808e0ae66a 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/