Module Name: src Committed By: pgoyette Date: Mon Apr 13 22:24:34 UTC 2015
Modified Files: src/sys/external/bsd/drm2/drm: drm_module.c src/sys/external/bsd/drm2/linux: linux_module.c Log Message: Update module dependencies: drmkms does not depend on iic drmkms_linux depends on i2cexec To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/drm/drm_module.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/linux/linux_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/drm/drm_module.c diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.10 src/sys/external/bsd/drm2/drm/drm_module.c:1.11 --- src/sys/external/bsd/drm2/drm/drm_module.c:1.10 Thu Mar 5 17:42:48 2015 +++ src/sys/external/bsd/drm2/drm/drm_module.c Mon Apr 13 22:24:34 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_module.c,v 1.10 2015/03/05 17:42:48 riastradh Exp $ */ +/* $NetBSD: drm_module.c,v 1.11 2015/04/13 22:24:34 pgoyette Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.10 2015/03/05 17:42:48 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.11 2015/04/13 22:24:34 pgoyette Exp $"); #include <sys/types.h> #include <sys/conf.h> @@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c /* * XXX I2C stuff should be moved to a separate drmkms_i2c module. */ -MODULE(MODULE_CLASS_DRIVER, drmkms, "iic,drmkms_linux"); +MODULE(MODULE_CLASS_DRIVER, drmkms, "drmkms_linux"); struct mutex drm_global_mutex; Index: src/sys/external/bsd/drm2/linux/linux_module.c diff -u src/sys/external/bsd/drm2/linux/linux_module.c:1.5 src/sys/external/bsd/drm2/linux/linux_module.c:1.6 --- src/sys/external/bsd/drm2/linux/linux_module.c:1.5 Tue Nov 11 02:37:17 2014 +++ src/sys/external/bsd/drm2/linux/linux_module.c Mon Apr 13 22:24:34 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_module.c,v 1.5 2014/11/11 02:37:17 christos Exp $ */ +/* $NetBSD: linux_module.c,v 1.6 2015/04/13 22:24:34 pgoyette Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_module.c,v 1.5 2014/11/11 02:37:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_module.c,v 1.6 2015/04/13 22:24:34 pgoyette Exp $"); #include <sys/module.h> #ifndef _MODULE @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_module #include <linux/reservation.h> #include <linux/workqueue.h> -MODULE(MODULE_CLASS_MISC, drmkms_linux, NULL); +MODULE(MODULE_CLASS_MISC, drmkms_linux, "i2cexec"); DEFINE_WW_CLASS(reservation_ww_class __cacheline_aligned);