From: François Tigeot <ftigeot@wolfpond.org>
Date: Sat, 7 Nov 2015 12:49:36 +0000 (+0100)
Subject: drm/i915: Rename the kernel module to i915.ko
X-Git-Tag: v4.5.0~153
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/0e9fd5631b6489d300e8b435ef5f4f1f199cda0a

drm/i915: Rename the kernel module to i915.ko

* Giving it the same name than on Linux

* Bump __DragonFly_version
---

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 6e1258936a..dfe2b8b200 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1382,7 +1382,6 @@ TO_REMOVE+=/usr/share/man/man8/loader.8.gz.old
 TO_REMOVE+=/usr/share/man/man2/syslink.2.gz
 TO_REMOVE+=/usr/share/man/man4/uhidev.4.gz
 TO_REMOVE+=/boot/kernel/drmn.ko
-TO_REMOVE+=/boot/kernel/i915.ko
 TO_REMOVE+=/usr/include/regexp.h
 TO_REMOVE+=/usr/include/sys/localedef.h
 TO_REMOVE+=/usr/share/locale/ASCII
diff --git a/sys/dev/drm/i915/Makefile b/sys/dev/drm/i915/Makefile
index 731a96bf0b..c826a1f697 100644
--- a/sys/dev/drm/i915/Makefile
+++ b/sys/dev/drm/i915/Makefile
@@ -1,4 +1,4 @@
-KMOD	= i915kms
+KMOD	= i915
 
 # core driver code
 SRCS =	i915_drv.c \
diff --git a/sys/dev/drm/i915/i915_drv.c b/sys/dev/drm/i915/i915_drv.c
index 16a41b93ad..87481a3a9f 100644
--- a/sys/dev/drm/i915/i915_drv.c
+++ b/sys/dev/drm/i915/i915_drv.c
@@ -1704,10 +1704,9 @@ static int __init i915_init(void)
 #endif
 }
 
-DRIVER_MODULE_ORDERED(i915kms, vgapci, i915_driver, drm_devclass, NULL, NULL,
-    SI_ORDER_ANY);
-MODULE_DEPEND(i915kms, drm, 1, 1, 1);
-MODULE_DEPEND(i915kms, agp, 1, 1, 1);
-MODULE_DEPEND(i915kms, iicbus, 1, 1, 1);
-MODULE_DEPEND(i915kms, iic, 1, 1, 1);
-MODULE_DEPEND(i915kms, iicbb, 1, 1, 1);
+DRIVER_MODULE_ORDERED(i915, vgapci, i915_driver, drm_devclass, NULL, NULL, SI_ORDER_ANY);
+MODULE_DEPEND(i915, drm, 1, 1, 1);
+MODULE_DEPEND(i915, agp, 1, 1, 1);
+MODULE_DEPEND(i915, iicbus, 1, 1, 1);
+MODULE_DEPEND(i915, iic, 1, 1, 1);
+MODULE_DEPEND(i915, iicbb, 1, 1, 1);
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 4209157842..1c8b9905a2 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -129,9 +129,10 @@
  * 400304 - Activate symbol versioning for libc.so (still on version 8)
  * 400305 - Add accept4() system call
  * 400306 - Add libexecinfo to base
+ * 400307 - drm/i915 kernel module renamed to i915.ko
  */
 #undef __DragonFly_version
-#define __DragonFly_version 400306	/* propagated to newvers */
+#define __DragonFly_version 400307	/* propagated to newvers */
 
 #include <sys/_null.h>