[src/trunk]: src/sys/external/bsd/drm2/nouveau The PCI driver is now named as...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/322bf1d928f5
branches:  trunk
changeset: 992832:322bf1d928f5
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:56:25 2018 +0000

description:
The PCI driver is now named as such.

diffstat:

 sys/external/bsd/drm2/nouveau/nouveau_pci.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 3aa9cfd6fcb2 -r 322bf1d928f5 sys/external/bsd/drm2/nouveau/nouveau_pci.c
--- a/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Mon Aug 27 07:56:13 2018 +0000
+++ b/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Mon Aug 27 07:56:25 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_pci.c,v 1.13 2018/08/27 07:35:41 riastradh Exp $       */
+/*     $NetBSD: nouveau_pci.c,v 1.14 2018/08/27 07:56:25 riastradh Exp $       */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.13 2018/08/27 07:35:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.14 2018/08/27 07:56:25 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -78,7 +78,7 @@
     nouveau_pci_match, nouveau_pci_attach, nouveau_pci_detach, NULL);
 
 /* Kludge to get this from nouveau_drm.c.  */
-extern struct drm_driver *const nouveau_drm_driver;
+extern struct drm_driver *const nouveau_drm_driver_pci;
 
 static int
 nouveau_pci_match(device_t parent, cfdata_t match, void *aux)
@@ -160,8 +160,8 @@
        }
 
        /* XXX errno Linux->NetBSD */
-       error = -drm_pci_attach(self, pa, &sc->sc_pci_dev, nouveau_drm_driver,
-           0, &sc->sc_drm_dev);
+       error = -drm_pci_attach(self, pa, &sc->sc_pci_dev,
+           nouveau_drm_driver_pci, 0, &sc->sc_drm_dev);
        if (error) {
                aprint_error_dev(self, "unable to attach drm: %d\n", error);
                return;
@@ -279,7 +279,7 @@
 
        switch (cmd) {
        case MODULE_CMD_INIT:
-               error = drm_pci_init(nouveau_drm_driver, NULL);
+               error = drm_pci_init(nouveau_drm_driver_pci, NULL);
                if (error) {
                        aprint_error("nouveau_pci: failed to init: %d\n",
                            error);
@@ -293,7 +293,7 @@
 #if 0          /* XXX nouveau acpi */
                nouveau_unregister_dsm_handler();
 #endif
-               drm_pci_exit(nouveau_drm_driver, NULL);
+               drm_pci_exit(nouveau_drm_driver_pci, NULL);
                break;
        default:
                return ENOTTY;