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>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index e405e61c27e2e23c4cc3326b7b04ad52851697d0..785127cb281b8759b7dd77ab240aedc113621f61 100644 (file)
--- 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 30ad13344f7b96da384ffff3209dc2683e1e282a..794ff67c5701386ce781abe5c0f91e42de150e26 100644 (file)
--- 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 06c9081d596d543339115539c4bb0c9f08bb773e..2abfa28a522b528ec1b6a5fad9657bb4eb7f736d 100644 (file)
--- 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"