diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-07 19:41:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-07 19:41:09 -0400 |
| commit | 85923b124624eb49ebef4731bb6b5670e792ff57 (patch) | |
| tree | fffb9af18c3639865552288210790000a63f666f /drivers | |
| parent | 9d9b7ad717474636dc961e6c321970fd799e1cb3 (diff) | |
| parent | a1134dd48d59e532b801659163539bf01cae7673 (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: point to migration document
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firewire/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index d011a76f8e7a..fe9e768cfbc4 100644 --- a/drivers/firewire/Kconfig +++ b/drivers/firewire/Kconfig | |||
| @@ -11,7 +11,8 @@ config FIREWIRE | |||
| 11 | This is the "Juju" FireWire stack, a new alternative implementation | 11 | This is the "Juju" FireWire stack, a new alternative implementation |
| 12 | designed for robustness and simplicity. You can build either this | 12 | designed for robustness and simplicity. You can build either this |
| 13 | stack, or the classic stack (the ieee1394 driver, ohci1394 etc.) | 13 | stack, or the classic stack (the ieee1394 driver, ohci1394 etc.) |
| 14 | or both. | 14 | or both. Please read http://wiki.linux1394.org/JujuMigration before |
| 15 | you enable the new stack. | ||
| 15 | 16 | ||
| 16 | To compile this driver as a module, say M here: the module will be | 17 | To compile this driver as a module, say M here: the module will be |
| 17 | called firewire-core. It functionally replaces ieee1394, raw1394, | 18 | called firewire-core. It functionally replaces ieee1394, raw1394, |