diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 16:19:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 16:19:31 -0500 |
| commit | 5fa3577b1a1202972e6e419040438c29f39f59cc (patch) | |
| tree | f148c5bfad584ba8ac79d43fd3e40a12d49d92af /include/drm/Kbuild | |
| parent | d4220f987cf473c65a342ca69e3eb13dea919a49 (diff) | |
| parent | fb1d9738ca053ea8afa5e86af6463155f983b01c (diff) | |
Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/vmwgfx: Add DRM driver for VMware Virtual GPU
drm/vmwgfx: Add svga headers for vmwgfx driver
drm/ttm: Add more driver type enums
Diffstat (limited to 'include/drm/Kbuild')
| -rw-r--r-- | include/drm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/Kbuild b/include/drm/Kbuild index cfa6af43c9ea..bd3a1c2fbdb4 100644 --- a/include/drm/Kbuild +++ b/include/drm/Kbuild | |||
| @@ -7,5 +7,6 @@ unifdef-y += r128_drm.h | |||
| 7 | unifdef-y += radeon_drm.h | 7 | unifdef-y += radeon_drm.h |
| 8 | unifdef-y += sis_drm.h | 8 | unifdef-y += sis_drm.h |
| 9 | unifdef-y += savage_drm.h | 9 | unifdef-y += savage_drm.h |
| 10 | unifdef-y += vmwgfx_drm.h | ||
| 10 | unifdef-y += via_drm.h | 11 | unifdef-y += via_drm.h |
| 11 | unifdef-y += nouveau_drm.h | 12 | unifdef-y += nouveau_drm.h |