diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 21:19:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 21:19:17 -0700 |
| commit | 734b397cd14f3340394a8dd3266bec97d01f034b (patch) | |
| tree | 0ac0ff92b1e8420992ab01af7fdf4459f59c9551 /drivers | |
| parent | 702beb87d6b4e08cca394b210679e5d7c2ac9383 (diff) | |
| parent | e6b51632b3579d96ce5aa1b3efdeceedd2921a2c (diff) | |
| download | op-kernel-dev-734b397cd14f3340394a8dd3266bec97d01f034b.zip op-kernel-dev-734b397cd14f3340394a8dd3266bec97d01f034b.tar.gz | |
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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index fda4467..808e0ae 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/ |
