On Thu, May 03, Olaf Hering wrote: > On Thu, May 03, Stefan Richter wrote: > > > ieee1394-old > > Noone will seriously ship two firewire stacks, so that cant be the > issue (for distributors). > > Once there is a way to easily switch between kernel releases, I'm ok > with whatever module names you pick.
This patch loads fw-sbp2 if sbp2 is still in the config file. So one can go back and forth between releases without worry about the root filesystem drivers. Index: linux-2.6.21/drivers/firewire/fw-ohci.c =================================================================== --- linux-2.6.21.orig/drivers/firewire/fw-ohci.c +++ linux-2.6.21/drivers/firewire/fw-ohci.c @@ -1881,6 +1881,9 @@ static struct pci_driver fw_ohci_pci_dri MODULE_AUTHOR("Kristian Hoegsberg <[EMAIL PROTECTED]>"); MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers"); MODULE_LICENSE("GPL"); +#ifndef CONFIG_IEEE1394_OHCI1394_MODULE +MODULE_ALIAS("ohci1394"); +#endif static int __init fw_ohci_init(void) { Index: linux-2.6.21/drivers/firewire/fw-sbp2.c =================================================================== --- linux-2.6.21.orig/drivers/firewire/fw-sbp2.c +++ linux-2.6.21/drivers/firewire/fw-sbp2.c @@ -1150,6 +1150,9 @@ MODULE_AUTHOR("Kristian Hoegsberg <[EMAIL PROTECTED] MODULE_DESCRIPTION("SCSI over IEEE1394"); MODULE_LICENSE("GPL"); MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table); +#ifndef CONFIG_IEEE1394_SBP2_MODULE +MODULE_ALIAS("sbp2"); +#endif static int __init sbp2_init(void) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/