summaryrefslogtreecommitdiffstats
path: root/sys/dev/isp/isp_pci.c
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>2006-12-10 03:41:48 +0000
committermjacob <mjacob@FreeBSD.org>2006-12-10 03:41:48 +0000
commitb2f314b8126fcf0cff7db08e414aa1d680d6d18a (patch)
tree3ec5772392dab6ed92b9d5f1655f69f8c127bbd4 /sys/dev/isp/isp_pci.c
parent5622035de6d27eb2800f558bc091e231dc9c1edc (diff)
downloadFreeBSD-src-b2f314b8126fcf0cff7db08e414aa1d680d6d18a.zip
FreeBSD-src-b2f314b8126fcf0cff7db08e414aa1d680d6d18a.tar.gz
Remove dependency on ispfw and firmware as modules.
Either they're there early and the ispfw sets have registered themselves, or they're not. The module dependency stuff isn't quite what we want anyway. If the user doesn't want the load placed on system memory by loading the firmware, they don't specify it to be loaded (either by being linked in or via being a module to be loaded and then hooked in with firmware(9)). It doesn't then make sense to then override what they want by pulling it in anyway. This might be able to work if we were able to pull in just exactly what we needed for the card we have- but that's an optimization left for the future.
Diffstat (limited to 'sys/dev/isp/isp_pci.c')
-rw-r--r--sys/dev/isp/isp_pci.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 2f9c9a5..6edffb1 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -352,10 +352,7 @@ static driver_t isp_pci_driver = {
};
static devclass_t isp_devclass;
DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0);
-#if __FreeBSD_version >= 700000
-MODULE_DEPEND(isp, ispfw, 1, 1, 1);
-MODULE_DEPEND(isp, firmware, 1, 1, 1);
-#else
+#if __FreeBSD_version < 700000
extern ispfwfunc *isp_get_firmware_p;
#endif
OpenPOWER on IntegriCloud