Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e4c7b0d authored by Olaf Hering's avatar Olaf Hering Committed by Stefan Richter
Browse files

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: default avatarKristian Hoegsberg <krh@redhat.com>

Existing mkinitrd scripts still have to be adapted, unless they grok
module aliases.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 58e313b3

drivers/firewire/fw-ohci.c

+5 −0
Original line number Diff line number Diff line
@@ -1926,6 +1926,11 @@ MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>"); 
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);

drivers/firewire/fw-sbp2.c

+5 −0
Original line number Diff line number Diff line
@@ -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);