summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-02-01 11:35:47 +1000
committerDave Airlie <airlied@redhat.com>2010-02-01 11:35:47 +1000
commitf71d0187987e691516cd10c2702f002c0e2f0edc (patch)
tree0fe6da59d5abd5e292e1f02eaa5580b284b90e41
parentff82f052d2a187dd0fa0e431ba70eb457c71a40e (diff)
downloadlinux-stable-f71d0187987e691516cd10c2702f002c0e2f0edc.tar.gz
linux-stable-f71d0187987e691516cd10c2702f002c0e2f0edc.tar.bz2
linux-stable-f71d0187987e691516cd10c2702f002c0e2f0edc.zip
drm/radeon/kms: move radeon KMS on/off switch out of staging.
We are happy enough that the KMS driver is stable enough for enough people for the kms enable/disable to leave staging. Distros can now contemplate turning this on. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/Kconfig2
-rw-r--r--drivers/staging/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 96eddd17e050..305c59003963 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -66,6 +66,8 @@ config DRM_RADEON
If M is selected, the module will be called radeon.
+source "drivers/gpu/drm/radeon/Kconfig"
+
config DRM_I810
tristate "Intel I810"
depends on DRM && AGP && AGP_INTEL
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 9533ab60cdb5..28e9b04aee15 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -103,8 +103,6 @@ source "drivers/staging/line6/Kconfig"
source "drivers/gpu/drm/vmwgfx/Kconfig"
-source "drivers/gpu/drm/radeon/Kconfig"
-
source "drivers/gpu/drm/nouveau/Kconfig"
source "drivers/staging/octeon/Kconfig"