diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-18 00:53:50 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-18 00:53:50 +0100 |
| commit | cbc8cc049aefd571ebc3c255dc3e265f736751c0 (patch) | |
| tree | 46626ce409b71790af6220ee0518be694693af99 /drivers/staging | |
| parent | drm/ttm: Fix memory type manager debug information printing (diff) | |
| parent | drm/vmwgfx: Add DRM driver for VMware Virtual GPU (diff) | |
| download | linux-cbc8cc049aefd571ebc3c255dc3e265f736751c0.tar.xz linux-cbc8cc049aefd571ebc3c255dc3e265f736751c0.zip | |
Merge remote branch 'korg/drm-vmware-staging' into drm-core-next
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 da74e216b71d..9533ab60cdb5 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -101,6 +101,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" |