Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:41:25 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/nouveau: nouveau_module.c
Log Message:
nouveau_objects_init is no more.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/nouveau/nouveau_module.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/nouveau/nouveau_module.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.4 src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.5
--- src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.4 Sat Oct 17 12:02:44 2015
+++ src/sys/external/bsd/drm2/nouveau/nouveau_module.c Mon Aug 27 06:41:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_module.c,v 1.4 2015/10/17 12:02:44 jmcneill Exp $ */
+/* $NetBSD: nouveau_module.c,v 1.5 2018/08/27 06:41:25 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.4 2015/10/17 12:02:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.5 2018/08/27 06:41:25 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -39,8 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_modu
#include <drm/drmP.h>
#include <drm/drm_sysctl.h>
-#include <core/object.h>
-#include <engine/device.h>
+#include <core/device.h>
MODULE(MODULE_CLASS_DRIVER, nouveau, "drmkms"); /* XXX drmkms_i2c, drmkms_ttm */
@@ -55,7 +54,6 @@ extern struct drm_driver *const nouveau_
static int
nouveau_init(void)
{
- nouveau_objects_init();
nouveau_devices_init();
drm_sysctl_init(&nouveau_def);
@@ -68,7 +66,6 @@ nouveau_fini(void)
drm_sysctl_fini(&nouveau_def);
nouveau_devices_fini();
- nouveau_objects_fini();
}
static int
