Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9a60731d0036a6c6c265acd4248c17fd24fc8e13
Commit:     9a60731d0036a6c6c265acd4248c17fd24fc8e13
Parent:     ec839e43fbe1b1ab74264ac510f6cd9c8e8334a4
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Fri May 25 13:54:49 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Sun May 27 23:21:01 2007 +0200

    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 <[EMAIL PROTECTED]>
    Acked-by: Kristian Hoegsberg <[EMAIL PROTECTED]>
---
 drivers/firewire/Kconfig  |   14 +++++++-------
 drivers/firewire/Makefile |   12 +++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 5932c72..396dade 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -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.
 
diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile
index fc7d59d..a7c31e9 100644
--- a/drivers/firewire/Makefile
+++ b/drivers/firewire/Makefile
@@ -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 \
-       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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to