diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 16:45:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 16:45:38 -0400 |
| commit | 486b4ce13221aa6cd0cbc9fff6993f444d8a52b5 (patch) | |
| tree | ca903d6f4213556a82f2268eeeac1fd01d80cd4a /drivers/firewire/Kconfig | |
| parent | 358a9afc35d550db4f67b1c8336f5326244ceeda (diff) | |
| parent | 350958f984268dcf0f087aac78c5b9fe2846aeff (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fix return code
firewire: prefix modules with firewire- instead of fw-
firewire: Add missing byteswapping for receive DMA programs.
ieee1394: raw1394: Fix async send
ieee1394: eth1394: bring back a parent device
ieee1394: eth1394: handle tlabel exhaustion
ieee1394: eth1394: remove bogus netif_wake_queue
ieee1394: sbp2: include workqueue.h
Diffstat (limited to 'drivers/firewire/Kconfig')
| -rw-r--r-- | drivers/firewire/Kconfig | 14 |
1 files changed, 7 insertions, 7 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 | ||