diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-03-16 04:19:14 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-03-22 03:18:12 -0400 |
commit | f3c93cbde7eab38671ae085cb1027b08f5f36757 (patch) | |
tree | e08adf2d7d8c7f82257b9f15dd80c6da542169b9 | |
parent | f887c425f9eeed8ffbca64c8be45da62b07096c0 (diff) |
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 <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 2418429a9836..8ea3bca22ee2 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
@@ -71,6 +71,8 @@ config DRM_RADEON | |||
71 | 71 | ||
72 | source "drivers/gpu/drm/radeon/Kconfig" | 72 | source "drivers/gpu/drm/radeon/Kconfig" |
73 | 73 | ||
74 | source "drivers/gpu/drm/nouveau/Kconfig" | ||
75 | |||
74 | config DRM_I810 | 76 | config DRM_I810 |
75 | tristate "Intel I810" | 77 | tristate "Intel I810" |
76 | # !PREEMPT because of missing ioctl locking | 78 | # !PREEMPT because of missing ioctl locking |
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 21e2f4b87f14..71cb8157f47d 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
@@ -66,8 +66,6 @@ source "drivers/staging/phison/Kconfig" | |||
66 | 66 | ||
67 | source "drivers/staging/line6/Kconfig" | 67 | source "drivers/staging/line6/Kconfig" |
68 | 68 | ||
69 | source "drivers/gpu/drm/nouveau/Kconfig" | ||
70 | |||
71 | source "drivers/staging/octeon/Kconfig" | 69 | source "drivers/staging/octeon/Kconfig" |
72 | 70 | ||
73 | source "drivers/staging/serqt_usb2/Kconfig" | 71 | source "drivers/staging/serqt_usb2/Kconfig" |