git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core...
[sfrench/cifs-2.6.git]
/
drivers
/
Makefile
diff --git
a/drivers/Makefile
b/drivers/Makefile
index f65deda72d6102636e47554c9864d529df27a258..808e0ae66aa80cfeead838ea27731457177a22a7 100644
(file)
--- a/
drivers/Makefile
+++ b/
drivers/Makefile
@@
-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/