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: Stefan Richter <stefanr@s5r6.in-berlin.de> Acked-by: Kristian Hoegsberg <krh@bitplanet.net>

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: Stefan Richter <stefanr@s5r6.in-berlin.de> Acked-by: Kristian Hoegsberg <krh@bitplanet.net>
Stefan Richter
1 parent ec839e43fb
Showing 2 changed files with 14 additions and 12 deletions Side-by-side Diff
drivers/firewire/Kconfig
drivers/firewire/Makefile
@@ -18,7 +18,7 @@
 	  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 @@
 	  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 @@
 	  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.
@@ -2,10 +2,12 @@
 # Makefile for the Linux IEEE 1394 implementation
 #
  
-fw-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
-	fw-device.o fw-cdev.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
...	...	@@ -18,7 +18,7 @@
18	18	your IEEE 1394 adapter.
19	19
20	20	To compile this driver as a module, say M here: the module will be
21		- called fw-core.
	21	+ called firewire-core.
22	22
23	23	This is the "JUJU" FireWire stack, an alternative implementation
24	24	designed for robustness and simplicity. You can build either this
25	25
...	...	@@ -34,11 +34,11 @@
34	34	is the only chipset in use, so say Y here.
35	35
36	36	To compile this driver as a module, say M here: The module will be
37		- called fw-ohci.
	37	+ called firewire-ohci.
38	38
39	39	If you also build ohci1394 of the classic IEEE 1394 driver stack,
40		- blacklist either ohci1394 or fw-ohci to let hotplug load the desired
41		- driver.
	40	+ blacklist either ohci1394 or firewire-ohci to let hotplug load the
	41	+ desired driver.
42	42
43	43	config FIREWIRE_SBP2
44	44	tristate "Support for storage devices (SBP-2 protocol driver)"
45	45
...	...	@@ -50,12 +50,12 @@
50	50	like scanners.
51	51
52	52	To compile this driver as a module, say M here: The module will be
53		- called fw-sbp2.
	53	+ called firewire-sbp2.
54	54
55	55	You should also enable support for disks, CD-ROMs, etc. in the SCSI
56	56	configuration section.
57	57
58	58	If you also build sbp2 of the classic IEEE 1394 driver stack,
59		- blacklist either sbp2 or fw-sbp2 to let hotplug load the desired
60		- driver.
	59	+ blacklist either sbp2 or firewire-sbp2 to let hotplug load the
	60	+ desired driver.
...	...	@@ -2,10 +2,12 @@
2	2	# Makefile for the Linux IEEE 1394 implementation
3	3	#
4	4
5		-fw-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
6		- fw-device.o fw-cdev.o
	5	+firewire-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
	6	+ fw-device.o fw-cdev.o
	7	+firewire-ohci-y += fw-ohci.o
	8	+firewire-sbp2-y += fw-sbp2.o
7	9
8		-obj-$(CONFIG_FIREWIRE) += fw-core.o
9		-obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o
10		-obj-$(CONFIG_FIREWIRE_SBP2) += fw-sbp2.o
	10	+obj-$(CONFIG_FIREWIRE) += firewire-core.o
	11	+obj-$(CONFIG_FIREWIRE_OHCI) += firewire-ohci.o
	12	+obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o