From 6969dfb00dd41651cb7ae8461c83cf42865db38a Mon Sep 17 00:00:00 2001 From: Alexander Polakov Date: Thu, 19 Jul 2012 23:18:52 +0400 Subject: [PATCH] Comment out drm_sleep_locking_init() in bsddrv Prototype is in drmP.h, implementation is missing atm. While there, add module dependency on new drm core. --- pscnv/nouveau_bsddrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pscnv/nouveau_bsddrv.c b/pscnv/nouveau_bsddrv.c index 679a567..6f6e47c 100644 --- a/pscnv/nouveau_bsddrv.c +++ b/pscnv/nouveau_bsddrv.c @@ -155,7 +155,7 @@ pscnv_attach(device_t kdev) if (nouveau_modeset == 1) driver.driver_features |= DRIVER_MODESET; dev->driver = &driver; - drm_sleep_locking_init(dev); + /* drm_sleep_locking_init(dev); XXX PLHK */ return (drm_attach(kdev, pciidlist)); } @@ -200,7 +200,7 @@ static driver_t pscnv_driver = { extern devclass_t drm_devclass; DRIVER_MODULE_ORDERED(pscnv, vgapci, pscnv_driver, drm_devclass, 0, 0, SI_ORDER_ANY); -MODULE_DEPEND(pscnv, drm, 1, 1, 1); +MODULE_DEPEND(pscnv, drmn, 1, 1, 1); MODULE_DEPEND(pscnv, agp, 1, 1, 1); MODULE_DEPEND(pscnv, iicbus, 1, 1, 1); MODULE_DEPEND(pscnv, iic, 1, 1, 1); -- 2.11.4.GIT