d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dependency on ispfw and firmware as modules.

Browse Source 
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.
This commit is contained in:
Matt Jacob 2006-12-10 03:41:48 +00:00
parent 42b20c8aa2
commit 3cce220cba
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/isp/isp_pci.c
View File

@ -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

4
sys/dev/isp/isp_sbus.c
View File

@ -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