From 7f2c7f9977d3e62c594d47ca8a5d7fefac2fc4de Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Fri, 30 Dec 2005 02:17:05 +0000
Subject: Merge patch from jhb to catch up with FreeBSD-current vgapci master
 device     changes.

---
 bsd-core/i915_drv.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'bsd-core/i915_drv.c')

diff --git a/bsd-core/i915_drv.c b/bsd-core/i915_drv.c
index 029fec2a..d5830e5a 100644
--- a/bsd-core/i915_drv.c
+++ b/bsd-core/i915_drv.c
@@ -95,13 +95,21 @@ static device_method_t i915_methods[] = {
 };
 
 static driver_t i915_driver = {
+#if __FreeBSD_version >= 700010
+	"drm",
+#else
 	"drmsub",
+#endif
 	i915_methods,
 	sizeof(drm_device_t)
 };
 
 extern devclass_t drm_devclass;
+#if __FreeBSD_version >= 700010
+DRIVER_MODULE(i915, vgapci, i915_driver, drm_devclass, 0, 0);
+#else
 DRIVER_MODULE(i915, agp, i915_driver, drm_devclass, 0, 0);
+#endif
 MODULE_DEPEND(i915, drm, 1, 1, 1);
 
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
-- 
cgit v1.2.3