diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-17 20:39:28 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-20 18:27:19 -0400 |
| commit | 11f494ee25dd81af90255b1d61abc6f5508db4d0 (patch) | |
| tree | c28d953d5185af834db5bcdffa60e040a90467b6 /drivers/firewire | |
| parent | b3d6e151142c6d22abdf1e3e7bde0f6d828df945 (diff) | |
firewire: rename CONFIG_FW to CONFIG_FIREWIRE
to avoid confusion with CONFIG_FW_LOADER.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: Kristian Høgsberg <krh@redhat.com>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/firewire/Makefile | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index 5c46e257bc9c..5fc56fac9700 100644 --- a/drivers/firewire/Kconfig +++ b/drivers/firewire/Kconfig | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | comment "An alternative FireWire stack is available with EXPERIMENTAL=y" | 3 | comment "An alternative FireWire stack is available with EXPERIMENTAL=y" |
| 4 | depends on EXPERIMENTAL=n | 4 | depends on EXPERIMENTAL=n |
| 5 | 5 | ||
| 6 | config FW | 6 | config FIREWIRE |
| 7 | tristate "IEEE 1394 (FireWire) support (JUJU alternative stack, experimental)" | 7 | tristate "IEEE 1394 (FireWire) support (JUJU alternative stack, experimental)" |
| 8 | depends on EXPERIMENTAL | 8 | depends on EXPERIMENTAL |
| 9 | help | 9 | help |
| @@ -24,9 +24,9 @@ config FW | |||
| 24 | stack, or the classic stack (the ieee1394 driver, ohci1394 etc.) | 24 | stack, or the classic stack (the ieee1394 driver, ohci1394 etc.) |
| 25 | or both. | 25 | or both. |
| 26 | 26 | ||
| 27 | config FW_OHCI | 27 | config FIREWIRE_OHCI |
| 28 | tristate "Support for OHCI FireWire host controllers" | 28 | tristate "Support for OHCI FireWire host controllers" |
| 29 | depends on PCI && FW | 29 | depends on PCI && FIREWIRE |
| 30 | help | 30 | help |
| 31 | Enable this driver if you have a FireWire controller based | 31 | Enable this driver if you have a FireWire controller based |
| 32 | on the OHCI specification. For all practical purposes, this | 32 | on the OHCI specification. For all practical purposes, this |
| @@ -39,9 +39,9 @@ config FW_OHCI | |||
| 39 | blacklist either ohci1394 or fw-ohci to let hotplug load the desired | 39 | blacklist either ohci1394 or fw-ohci to let hotplug load the desired |
| 40 | driver. | 40 | driver. |
| 41 | 41 | ||
| 42 | config FW_SBP2 | 42 | config FIREWIRE_SBP2 |
| 43 | tristate "Support for storage devices (SBP-2 protocol driver)" | 43 | tristate "Support for storage devices (SBP-2 protocol driver)" |
| 44 | depends on FW && SCSI | 44 | depends on FIREWIRE && SCSI |
| 45 | help | 45 | help |
| 46 | This option enables you to use SBP-2 devices connected to a | 46 | This option enables you to use SBP-2 devices connected to a |
| 47 | FireWire bus. SBP-2 devices include storage devices like | 47 | FireWire bus. SBP-2 devices include storage devices like |
diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile index b955c9998549..eddc16c701b5 100644 --- a/drivers/firewire/Makefile +++ b/drivers/firewire/Makefile | |||
| @@ -5,6 +5,6 @@ | |||
| 5 | fw-core-objs := fw-card.o fw-topology.o fw-transaction.o fw-iso.o \ | 5 | fw-core-objs := fw-card.o fw-topology.o fw-transaction.o fw-iso.o \ |
| 6 | fw-device.o fw-device-cdev.o | 6 | fw-device.o fw-device-cdev.o |
| 7 | 7 | ||
| 8 | obj-$(CONFIG_FW) += fw-core.o | 8 | obj-$(CONFIG_FIREWIRE) += fw-core.o |
| 9 | obj-$(CONFIG_FW_OHCI) += fw-ohci.o | 9 | obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o |
| 10 | obj-$(CONFIG_FW_SBP2) += fw-sbp2.o \ No newline at end of file | 10 | obj-$(CONFIG_FIREWIRE_SBP2) += fw-sbp2.o |