diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2011-10-11 10:42:51 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-11 13:06:36 +0100 |
| commit | 5a7b74beca675968f612ad6188808ed67ac58e36 (patch) | |
| tree | 399001fe566727024937351849b926ddf85de6ab | |
| parent | 836e53d7586bcb1440ae1f6e146102318d0436b6 (diff) | |
vmwgfx: Take the driver out of staging
Also improve a bit on the Kconfig help.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index e405e61c27e..785127cb281 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -159,4 +159,6 @@ config DRM_SAVAGE Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister chipset. If M is selected the module will be called savage. -source "drivers/gpu/drm/exynos/Kconfig"
\ No newline at end of file +source "drivers/gpu/drm/exynos/Kconfig" + +source "drivers/gpu/drm/vmwgfx/Kconfig" diff --git a/drivers/gpu/drm/vmwgfx/Kconfig b/drivers/gpu/drm/vmwgfx/Kconfig index 30ad13344f7..794ff67c570 100644 --- a/drivers/gpu/drm/vmwgfx/Kconfig +++ b/drivers/gpu/drm/vmwgfx/Kconfig @@ -7,7 +7,8 @@ config DRM_VMWGFX select FB_CFB_IMAGEBLIT select DRM_TTM help - KMS enabled DRM driver for SVGA2 virtual hardware. - - If unsure say n. The compiled module will be - called vmwgfx.ko + Choose this option if you would like to run 3D acceleration + in a VMware virtual machine. + This is a KMS enabled DRM driver for the VMware SVGA2 + virtual hardware. + The compiled module will be called "vmwgfx.ko". diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 06c9081d596..2abfa28a522 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -72,8 +72,6 @@ source "drivers/staging/phison/Kconfig" source "drivers/staging/line6/Kconfig" -source "drivers/gpu/drm/vmwgfx/Kconfig" - source "drivers/gpu/drm/nouveau/Kconfig" source "drivers/staging/octeon/Kconfig" |