aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2007-05-05 17:17:13 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-05-10 12:24:14 -0400
commit1e4c7b0dabb46eb3a2a15cf5efbd3945b13373a0 (patch)
treee20e446acf3312783f71ff0844c342b83cd1de7e /drivers
parent58e313b36237ec0a2dc12fd4f7f06d875ce54bd1 (diff)
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 <krh@redhat.com> Existing mkinitrd scripts still have to be adapted, unless they grok module aliases. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firewire/fw-ohci.c5
-rw-r--r--drivers/firewire/fw-sbp2.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 7e1a4e1f7d46..7d91b7e8f028 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1926,6 +1926,11 @@ MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>");
1926MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers"); 1926MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers");
1927MODULE_LICENSE("GPL"); 1927MODULE_LICENSE("GPL");
1928 1928
1929/* Provide a module alias so root-on-sbp2 initrds don't break. */
1930#ifndef CONFIG_IEEE1394_OHCI1394_MODULE
1931MODULE_ALIAS("ohci1394");
1932#endif
1933
1929static int __init fw_ohci_init(void) 1934static int __init fw_ohci_init(void)
1930{ 1935{
1931 return pci_register_driver(&fw_ohci_pci_driver); 1936 return pci_register_driver(&fw_ohci_pci_driver);
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 196de46c00b6..282e4066e8c6 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -1181,6 +1181,11 @@ MODULE_DESCRIPTION("SCSI over IEEE1394");
1181MODULE_LICENSE("GPL"); 1181MODULE_LICENSE("GPL");
1182MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table); 1182MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
1183 1183
1184/* Provide a module alias so root-on-sbp2 initrds don't break. */
1185#ifndef CONFIG_IEEE1394_SBP2_MODULE
1186MODULE_ALIAS("sbp2");
1187#endif
1188
1184static int __init sbp2_init(void) 1189static int __init sbp2_init(void)
1185{ 1190{
1186 return driver_register(&sbp2_driver.driver); 1191 return driver_register(&sbp2_driver.driver);