diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-05-25 07:54:49 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-05-27 17:21:01 -0400 |
commit | 9a60731d0036a6c6c265acd4248c17fd24fc8e13 (patch) | |
tree | d72cc41fdda31d2c204c2a8a663242e1e55d30da /drivers | |
parent | ec839e43fbe1b1ab74264ac510f6cd9c8e8334a4 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/firewire/Kconfig | 14 | ||||
-rw-r--r-- | drivers/firewire/Makefile | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index 5932c72f9e42..396dade731f9 100644 --- a/drivers/firewire/Kconfig +++ b/drivers/firewire/Kconfig | |||
@@ -18,7 +18,7 @@ config FIREWIRE | |||
18 | your IEEE 1394 adapter. | 18 | your IEEE 1394 adapter. |
19 | 19 | ||
20 | To compile this driver as a module, say M here: the module will be | 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 | This is the "JUJU" FireWire stack, an alternative implementation | 23 | This is the "JUJU" FireWire stack, an alternative implementation |
24 | designed for robustness and simplicity. You can build either this | 24 | designed for robustness and simplicity. You can build either this |
@@ -34,11 +34,11 @@ config FIREWIRE_OHCI | |||
34 | is the only chipset in use, so say Y here. | 34 | is the only chipset in use, so say Y here. |
35 | 35 | ||
36 | To compile this driver as a module, say M here: The module will be | 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 | If you also build ohci1394 of the classic IEEE 1394 driver stack, | 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 | 40 | blacklist either ohci1394 or firewire-ohci to let hotplug load the |
41 | driver. | 41 | desired driver. |
42 | 42 | ||
43 | config FIREWIRE_SBP2 | 43 | config FIREWIRE_SBP2 |
44 | tristate "Support for storage devices (SBP-2 protocol driver)" | 44 | tristate "Support for storage devices (SBP-2 protocol driver)" |
@@ -50,12 +50,12 @@ config FIREWIRE_SBP2 | |||
50 | like scanners. | 50 | like scanners. |
51 | 51 | ||
52 | To compile this driver as a module, say M here: The module will be | 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 | You should also enable support for disks, CD-ROMs, etc. in the SCSI | 55 | You should also enable support for disks, CD-ROMs, etc. in the SCSI |
56 | configuration section. | 56 | configuration section. |
57 | 57 | ||
58 | If you also build sbp2 of the classic IEEE 1394 driver stack, | 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 | 59 | blacklist either sbp2 or firewire-sbp2 to let hotplug load the |
60 | driver. | 60 | desired driver. |
61 | 61 | ||
diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile index fc7d59d4bce0..a7c31e9039c1 100644 --- a/drivers/firewire/Makefile +++ b/drivers/firewire/Makefile | |||
@@ -2,9 +2,11 @@ | |||
2 | # Makefile for the Linux IEEE 1394 implementation | 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 \ | 5 | firewire-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \ |
6 | fw-device.o fw-cdev.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 | 10 | obj-$(CONFIG_FIREWIRE) += firewire-core.o |
9 | obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o | 11 | obj-$(CONFIG_FIREWIRE_OHCI) += firewire-ohci.o |
10 | obj-$(CONFIG_FIREWIRE_SBP2) += fw-sbp2.o | 12 | obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o |