From 3cce220cba945fab59f16aaa974adc0f3fe1581d Mon Sep 17 00:00:00 2001 From: Matt Jacob Date: Sun, 10 Dec 2006 03:41:48 +0000 Subject: [PATCH] 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. --- sys/dev/isp/isp_pci.c | 5 +---- sys/dev/isp/isp_sbus.c | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 2f9c9a55ede2..6edffb1ae949 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 diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c index 2e1273be8968..bc18bf2cfdb7 100644 --- a/sys/dev/isp/isp_sbus.c +++ b/sys/dev/isp/isp_sbus.c @@ -113,9 +113,7 @@ static driver_t isp_sbus_driver = { }; static devclass_t isp_devclass; DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0); -#if __FreeBSD_version >= 700000 -MODULE_DEPEND(isp, firmware, 1, 1, 1); -#else +#if __FreeBSD_version < 700000 extern ispfwfunc *isp_get_firmware_p; #endif