diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 20:32:24 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 20:32:24 (GMT) |
| commit | c142bda458a9c81097238800e1bd8eeeea09913d (patch) | |
| tree | a412321f62cbb90cae831d7f2dea026cbd3c958c /drivers/Makefile | |
| parent | b5cf43c47b05c8deb10f9674d541dddbdec0e341 (diff) | |
| parent | c0e09200dc0813972442e550a5905a132768e56c (diff) | |
| download | linux-fsl-qoriq-c142bda458a9c81097238800e1bd8eeeea09913d.tar.xz | |
Merge branch 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: reorganise drm tree to be more future proof.
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index f65deda..fda4467 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -10,6 +10,7 @@ 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 |