aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-07 16:41:09 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-07 16:41:09 -0700
commit85923b124624eb49ebef4731bb6b5670e792ff57 (patch)
treefffb9af18c3639865552288210790000a63f666f
parent9d9b7ad717474636dc961e6c321970fd799e1cb3 (diff)
parenta1134dd48d59e532b801659163539bf01cae7673 (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
-rw-r--r--drivers/firewire/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index d011a76f8e7..fe9e768cfbc 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -11,7 +11,8 @@ config FIREWIRE
This is the "Juju" FireWire stack, a new alternative implementation
designed for robustness and simplicity. You can build either this
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
called firewire-core. It functionally replaces ieee1394, raw1394,