Module Name: src Committed By: riastradh Date: Mon Aug 27 14:19:09 UTC 2018
Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_drm.c Log Message: Reduce diff a little. This code was already #ifndef __NetBSD__; the corresponding logic lives in nouveau_module.c. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.12 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.13 --- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.12 Mon Aug 27 13:38:15 2018 +++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c Mon Aug 27 14:19:08 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_drm.c,v 1.12 2018/08/27 13:38:15 riastradh Exp $ */ +/* $NetBSD: nouveau_drm.c,v 1.13 2018/08/27 14:19:08 riastradh Exp $ */ /* * Copyright 2012 Red Hat Inc. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.12 2018/08/27 13:38:15 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.13 2018/08/27 14:19:08 riastradh Exp $"); #include <linux/console.h> #include <linux/delay.h> @@ -1151,15 +1151,8 @@ nouveau_drm_init(void) { driver_pci = driver_stub; driver_pci.set_busid = drm_pci_set_busid; -#ifdef __NetBSD__ - driver_pci.request_irq = drm_pci_request_irq; - driver_pci.free_irq = drm_pci_free_irq; -#endif driver_platform = driver_stub; driver_platform.set_busid = drm_platform_set_busid; -#ifdef __NetBSD__ - /* XXX platform intr establish? */ -#endif nouveau_display_options();