xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86pciBus.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e3fb178617a579c98877a3baae14c4dfe4d55db8
Author: Maya Rashish <maya at NetBSD.org>
Date:   Thu Jan 10 14:55:17 2019 +0200

    xfree86: Try nouveau on NetBSD as well.

diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 0718cdcb0..6575c4ec8 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -1190,7 +1190,7 @@ xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md)
     {
         int idx = 0;
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__NetBSD__)
         driverList[idx++] = "nouveau";
 #endif
         driverList[idx++] = "nv";