drm/nouveau: move out of staging drivers

There's really no good reason for us to be in here anymore, we have to
maintain this ABI anyway to avoid angering people.

Signed-off-by: Ben Skeggs <[email protected]>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 2418429a98360fd996888e5ccce6189bad9d9a86..8ea3bca22ee2f4859c10f7ee9bc01dd0f09487c3 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -71,6 +71,8 @@ config DRM_RADEON
 
 source "drivers/gpu/drm/radeon/Kconfig"
 
+source "drivers/gpu/drm/nouveau/Kconfig"
+
 config DRM_I810
        tristate "Intel I810"
        # !PREEMPT because of missing ioctl locking

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 21e2f4b87f1421f3780239543c2a90b1733ebb1c..71cb8157f47da567943db02cc2164abba462d118 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -66,8 +66,6 @@ source "drivers/staging/phison/Kconfig"
 
 source "drivers/staging/line6/Kconfig"
 
-source "drivers/gpu/drm/nouveau/Kconfig"
-
 source "drivers/staging/octeon/Kconfig"
 
 source "drivers/staging/serqt_usb2/Kconfig"