diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 00:19:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 00:19:17 -0400 |
| commit | 734b397cd14f3340394a8dd3266bec97d01f034b (patch) | |
| tree | 0ac0ff92b1e8420992ab01af7fdf4459f59c9551 | |
| parent | 702beb87d6b4e08cca394b210679e5d7c2ac9383 (diff) | |
| parent | e6b51632b3579d96ce5aa1b3efdeceedd2921a2c (diff) | |
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.
| -rw-r--r-- | drivers/Makefile | 4 |
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/ | |||
| 10 | obj-$(CONFIG_PARISC) += parisc/ | 10 | obj-$(CONFIG_PARISC) += parisc/ |
| 11 | obj-$(CONFIG_RAPIDIO) += rapidio/ | 11 | obj-$(CONFIG_RAPIDIO) += rapidio/ |
| 12 | obj-y += video/ | 12 | obj-y += video/ |
| 13 | obj-y += gpu/ | ||
| 14 | obj-$(CONFIG_ACPI) += acpi/ | 13 | obj-$(CONFIG_ACPI) += acpi/ |
| 15 | # PnP must come after ACPI since it will eventually need to check if acpi | 14 | # PnP must come after ACPI since it will eventually need to check if acpi |
| 16 | # was used and do nothing if so | 15 | # was used and do nothing if so |
| @@ -23,6 +22,9 @@ obj-$(CONFIG_XEN) += xen/ | |||
| 23 | # default. | 22 | # default. |
| 24 | obj-y += char/ | 23 | obj-y += char/ |
| 25 | 24 | ||
| 25 | # gpu/ comes after char for AGP vs DRM startup | ||
| 26 | obj-y += gpu/ | ||
| 27 | |||
| 26 | obj-$(CONFIG_CONNECTOR) += connector/ | 28 | obj-$(CONFIG_CONNECTOR) += connector/ |
| 27 | 29 | ||
| 28 | # i810fb and intelfb depend on char/agp/ | 30 | # i810fb and intelfb depend on char/agp/ |