lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firewire: Provide module aliase for backwards compatibility.

Browse Source 
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>
This commit is contained in:
Olaf Hering
2007-05-05 23:17:13 +02:00
committed by Stefan Richter
parent 58e313b362
commit 1e4c7b0dab
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/firewire/fw-ohci.c
View File

@@ -1926,6 +1926,11 @@ MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>");
MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers"); MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers");
MODULE_LICENSE("GPL"); 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) static int __init fw_ohci_init(void)
{ {
return pci_register_driver(&fw_ohci_pci_driver); return pci_register_driver(&fw_ohci_pci_driver);

5
drivers/firewire/fw-sbp2.c
View File

@@ -1181,6 +1181,11 @@ MODULE_DESCRIPTION("SCSI over IEEE1394");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table); 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) static int __init sbp2_init(void)
{ {
return driver_register(&sbp2_driver.driver); return driver_register(&sbp2_driver.driver);