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 /drivers/staging | |
| 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 'drivers/staging')
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 54e174d28234..093f57af32d3 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
| @@ -99,6 +99,8 @@ source "drivers/staging/p9auth/Kconfig" | |||
| 99 | 99 | ||
| 100 | source "drivers/staging/line6/Kconfig" | 100 | source "drivers/staging/line6/Kconfig" |
| 101 | 101 | ||
| 102 | source "drivers/gpu/drm/vmwgfx/Kconfig" | ||
| 103 | |||
| 102 | source "drivers/gpu/drm/radeon/Kconfig" | 104 | source "drivers/gpu/drm/radeon/Kconfig" |
| 103 | 105 | ||
| 104 | source "drivers/gpu/drm/nouveau/Kconfig" | 106 | source "drivers/gpu/drm/nouveau/Kconfig" |