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

Commit 9a60731d authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: prefix modules with firewire- instead of fw- 



Of course everybody immediately associates "fw-" with FireWire, not
firmware or firewall or whatever.  But "firewire-" has a nice ring to
it too.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: default avatarKristian Hoegsberg <krh@bitplanet.net>
parent ec839e43

drivers/firewire/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ config FIREWIRE 
	  your IEEE 1394 adapter.



	  To compile this driver as a module, say M here: the module will be

	  called fw-core.

	  called firewire-core.



	  This is the "JUJU" FireWire stack, an alternative implementation

	  designed for robustness and simplicity.  You can build either this
@@ -34,11 +34,11 @@ config FIREWIRE_OHCI 
	  is the only chipset in use, so say Y here.



	  To compile this driver as a module, say M here:  The module will be

	  called fw-ohci.

	  called firewire-ohci.



	  If you also build ohci1394 of the classic IEEE 1394 driver stack,

	  blacklist either ohci1394 or fw-ohci to let hotplug load the desired

	  driver.

	  blacklist either ohci1394 or firewire-ohci to let hotplug load the

	  desired driver.



config FIREWIRE_SBP2

	tristate "Support for storage devices (SBP-2 protocol driver)"
@@ -50,12 +50,12 @@ config FIREWIRE_SBP2 
	  like scanners.



	  To compile this driver as a module, say M here:  The module will be

	  called fw-sbp2.

	  called firewire-sbp2.



	  You should also enable support for disks, CD-ROMs, etc. in the SCSI

	  configuration section.



	  If you also build sbp2 of the classic IEEE 1394 driver stack,

	  blacklist either sbp2 or fw-sbp2 to let hotplug load the desired

	  driver.

	  blacklist either sbp2 or firewire-sbp2 to let hotplug load the

	  desired driver.

drivers/firewire/Makefile

+7 −5
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ 
# Makefile for the Linux IEEE 1394 implementation

#



fw-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \

firewire-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \

                   fw-device.o fw-cdev.o

firewire-ohci-y += fw-ohci.o

firewire-sbp2-y += fw-sbp2.o



obj-$(CONFIG_FIREWIRE) += fw-core.o

obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o

obj-$(CONFIG_FIREWIRE_SBP2) += fw-sbp2.o
 
obj-$(CONFIG_FIREWIRE) += firewire-core.o

obj-$(CONFIG_FIREWIRE_OHCI) += firewire-ohci.o

obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o