firewire: Provide module aliase for backwards compatibility.

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. Signed-off-by: Kristian Hoegsberg <[email protected]> Existing mkinitrd scripts still have to be adapted, unless they grok module aliases. Signed-off-by: Stefan Richter <[email protected]>
nrgmilk · May 10, 2007 · 1e4c7b0 · 1e4c7b0
1 parent 58e313b
commit 1e4c7b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
@@ -1926,6 +1926,11 @@ MODULE_AUTHOR("Kristian Hoegsberg <[email protected]>");
 MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers");
 MODULE_LICENSE("GPL");
 
+/* Provide a module alias so root-on-sbp2 initrds don't break. */
+#ifndef CONFIG_IEEE1394_OHCI1394_MODULE
+MODULE_ALIAS("ohci1394");
+#endif
+
 static int __init fw_ohci_init(void)
 {
 	return pci_register_driver(&fw_ohci_pci_driver);

diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
@@ -1181,6 +1181,11 @@ MODULE_DESCRIPTION("SCSI over IEEE1394");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
 
+/* Provide a module alias so root-on-sbp2 initrds don't break. */
+#ifndef CONFIG_IEEE1394_SBP2_MODULE
+MODULE_ALIAS("sbp2");
+#endif
+
 static int __init sbp2_init(void)
 {
 	return driver_register(&sbp2_driver.driver);