diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-10-15 11:21:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-10-15 11:21:49 +1000 |
| commit | b24fdd4b3830f77ff71c09eaec6a617e88abe419 (patch) | |
| tree | 123628b3c27646c5ae7dbbdf3ad7e4a041f75916 /drivers/gpu/drm/mgag200/Kconfig | |
| parent | 029f56db6ac248769f2c260bfaf3c3c0e23e904c (diff) | |
| parent | 640eee067d9aae0bb98d8706001976ff1affaf00 (diff) | |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.10-merged
Conflict resolution temp branch
Diffstat (limited to 'drivers/gpu/drm/mgag200/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/mgag200/Kconfig | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/drm/mgag200/Kconfig b/drivers/gpu/drm/mgag200/Kconfig index 93be766715c9..eec59658a938 100644 --- a/drivers/gpu/drm/mgag200/Kconfig +++ b/drivers/gpu/drm/mgag200/Kconfig @@ -1,13 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_MGAG200 - tristate "Kernel modesetting driver for MGA G200 server engines" + tristate "Matrox G200" depends on DRM && PCI && MMU select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER help - This is a KMS driver for the MGA G200 server chips, it - does not support the original MGA G200 or any of the desktop - chips. It requires 0.3.0 of the modesetting userspace driver, - and a version of mga driver that will fail on KMS enabled - devices. - + This is a KMS driver for Matrox G200 chips. It supports the original + MGA G200 desktop chips and the server variants. It requires 0.3.0 + of the modesetting userspace driver, and a version of mga driver + that will fail on KMS enabled devices. |