MFC: (1.16) Fixing a name collision in module declaration by renaming

"firewire" to "if_firewire."  According to the PR originator and Cai's
test, this bug prevents a RELENG_6 GENERIC kernel from loading if_fwip.ko
and will panic the kernel if users compile "device fwip" into their
GENERIC kernel.

Approved by:	re (scottl)
This commit is contained in:
avatar 2005-10-28 22:45:52 +00:00
parent cf1a35e6f5
commit 07ad715e98

View File

@ -850,10 +850,10 @@ firewire_modevent(module_t mod, int type, void *data)
}
static moduledata_t firewire_mod = {
"firewire",
"if_firewire",
firewire_modevent,
0
};
DECLARE_MODULE(firewire, firewire_mod, SI_SUB_INIT_IF, SI_ORDER_ANY);
MODULE_VERSION(firewire, 1);
DECLARE_MODULE(if_firewire, firewire_mod, SI_SUB_INIT_IF, SI_ORDER_ANY);
MODULE_VERSION(if_firewire, 1);