aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-01-31 20:35:47 -0500
committerDave Airlie <airlied@redhat.com>2010-01-31 20:35:47 -0500
commitf71d0187987e691516cd10c2702f002c0e2f0edc (patch)
tree0fe6da59d5abd5e292e1f02eaa5580b284b90e41
parentff82f052d2a187dd0fa0e431ba70eb457c71a40e (diff)
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
66 66
67 If M is selected, the module will be called radeon. 67 If M is selected, the module will be called radeon.
68 68
69source "drivers/gpu/drm/radeon/Kconfig"
70
69config DRM_I810 71config DRM_I810
70 tristate "Intel I810" 72 tristate "Intel I810"
71 depends on DRM && AGP && AGP_INTEL 73 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"
103 103
104source "drivers/gpu/drm/vmwgfx/Kconfig" 104source "drivers/gpu/drm/vmwgfx/Kconfig"
105 105
106source "drivers/gpu/drm/radeon/Kconfig"
107
108source "drivers/gpu/drm/nouveau/Kconfig" 106source "drivers/gpu/drm/nouveau/Kconfig"
109 107
110source "drivers/staging/octeon/Kconfig" 108source "drivers/staging/octeon/Kconfig"