Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 734b397c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.
parents 702beb87 e6b51632

drivers/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -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/