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

Commit 11f494ee authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: rename CONFIG_FW to CONFIG_FIREWIRE



to avoid confusion with CONFIG_FW_LOADER.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: default avatarKristian Høgsberg <krh@redhat.com>
parent b3d6e151
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ obj-$(CONFIG_FC4) += fc4/
obj-$(CONFIG_SCSI)		+= scsi/
obj-$(CONFIG_ATA)		+= ata/
obj-$(CONFIG_FUSION)		+= message/
obj-$(CONFIG_FW)		+= firewire/
obj-$(CONFIG_FIREWIRE)		+= firewire/
obj-$(CONFIG_IEEE1394)		+= ieee1394/
obj-y				+= cdrom/
obj-y				+= auxdisplay/
+5 −5
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
	depends on EXPERIMENTAL=n

config FW
config FIREWIRE
	tristate "IEEE 1394 (FireWire) support (JUJU alternative stack, experimental)"
	depends on EXPERIMENTAL
	help
@@ -24,9 +24,9 @@ config FW
	  stack, or the classic stack (the ieee1394 driver, ohci1394 etc.)
	  or both.

config FW_OHCI
config FIREWIRE_OHCI
	tristate "Support for OHCI FireWire host controllers"
	depends on PCI && FW
	depends on PCI && FIREWIRE
	help
	  Enable this driver if you have a FireWire controller based
	  on the OHCI specification.  For all practical purposes, this
@@ -39,9 +39,9 @@ config FW_OHCI
	  blacklist either ohci1394 or fw-ohci to let hotplug load the desired
	  driver.

config FW_SBP2
config FIREWIRE_SBP2
	tristate "Support for storage devices (SBP-2 protocol driver)"
	depends on FW && SCSI
	depends on FIREWIRE && SCSI
	help
	  This option enables you to use SBP-2 devices connected to a
	  FireWire bus.  SBP-2 devices include storage devices like
+3 −3
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@
fw-core-objs := fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
	fw-device.o fw-device-cdev.o

obj-$(CONFIG_FW) += fw-core.o
obj-$(CONFIG_FW_OHCI) += fw-ohci.o
obj-$(CONFIG_FW_SBP2) += fw-sbp2.o
 No newline at end of file
obj-$(CONFIG_FIREWIRE) += fw-core.o
obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o
obj-$(CONFIG_FIREWIRE_SBP2) += fw-sbp2.o