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
This commit is contained in:
Linus Torvalds
2007-10-07 16:41:09 -07:00

View File

@@ -11,7 +11,8 @@ config FIREWIRE
This is the "Juju" FireWire stack, a new alternative implementation This is the "Juju" FireWire stack, a new alternative implementation
designed for robustness and simplicity. You can build either this designed for robustness and simplicity. You can build either this
stack, or the classic stack (the ieee1394 driver, ohci1394 etc.) stack, or the classic stack (the ieee1394 driver, ohci1394 etc.)
or both. or both. Please read http://wiki.linux1394.org/JujuMigration before
you enable the new stack.
To compile this driver as a module, say M here: the module will be To compile this driver as a module, say M here: the module will be
called firewire-core. It functionally replaces ieee1394, raw1394, called firewire-core. It functionally replaces ieee1394, raw1394,