Commit:     1e4c7b0dabb46eb3a2a15cf5efbd3945b13373a0
Parent:     58e313b36237ec0a2dc12fd4f7f06d875ce54bd1
Author:     Olaf Hering <[EMAIL PROTECTED]>
AuthorDate: Sat May 5 23:17:13 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Thu May 10 18:24:14 2007 +0200

    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]>
 drivers/firewire/fw-ohci.c |    5 +++++
 drivers/firewire/fw-sbp2.c |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 7e1a4e1..7d91b7e 100644
--- 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");
+/* Provide a module alias so root-on-sbp2 initrds don't break. */
+#ifndef CONFIG_IEEE1394_OHCI1394_MODULE
 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
index 196de46..282e406 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -1181,6 +1181,11 @@ MODULE_DESCRIPTION("SCSI over IEEE1394");
 MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
+/* Provide a module alias so root-on-sbp2 initrds don't break. */
 static int __init sbp2_init(void)
        return driver_register(&sbp2_driver.driver);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to