aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 13:19:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 13:19:31 -0800
commit5fa3577b1a1202972e6e419040438c29f39f59cc (patch)
treef148c5bfad584ba8ac79d43fd3e40a12d49d92af /drivers/staging
parentd4220f987cf473c65a342ca69e3eb13dea919a49 (diff)
parentfb1d9738ca053ea8afa5e86af6463155f983b01c (diff)
downloadkernel_samsung_smdk4412-5fa3577b1a1202972e6e419040438c29f39f59cc.zip
kernel_samsung_smdk4412-5fa3577b1a1202972e6e419040438c29f39f59cc.tar.gz
kernel_samsung_smdk4412-5fa3577b1a1202972e6e419040438c29f39f59cc.tar.bz2
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/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 54e174d..093f57a 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -99,6 +99,8 @@ source "drivers/staging/p9auth/Kconfig"
source "drivers/staging/line6/Kconfig"
+source "drivers/gpu/drm/vmwgfx/Kconfig"
+
source "drivers/gpu/drm/radeon/Kconfig"
source "drivers/gpu/drm/nouveau/Kconfig"