diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-03-16 18:19:14 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-03-22 17:18:12 +1000 |
| commit | f3c93cbde7eab38671ae085cb1027b08f5f36757 (patch) | |
| tree | e08adf2d7d8c7f82257b9f15dd80c6da542169b9 | |
| parent | f887c425f9eeed8ffbca64c8be45da62b07096c0 (diff) | |
| download | linux-3.10-f3c93cbde7eab38671ae085cb1027b08f5f36757.tar.gz linux-3.10-f3c93cbde7eab38671ae085cb1027b08f5f36757.tar.bz2 linux-3.10-f3c93cbde7eab38671ae085cb1027b08f5f36757.zip | |
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 2418429a983..8ea3bca22ee 100644 --- 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 21e2f4b87f1..71cb8157f47 100644 --- 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" |