aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-19 13:56:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-19 13:56:21 -0700
commit395c68464cffbc645919a93d6111bc15201167f3 (patch)
tree7a58728236ac599c8121a7975e2293caeea9b02b /drivers/firewire
parentddd13dc606ea1a06f2cf7d11dc06418de3e28121 (diff)
parent30b0aa7c9a5e769a874a456cd56396eebf164b91 (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: Kconfig help update ieee1394: sbp2: let nodemgr retry node updates during bus reset series ieee1394: don't drop nodes during bus reset series ieee1394: regression in 2.6.25: updates should happen before probes
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index fa6d6abefd4d..450902438208 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -12,8 +12,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 old stack (the ieee1394 driver, ohci1394 etc.) or both.
- Please read http://wiki.linux1394.org/JujuMigration before you
- enable the new stack.
+ Please read http://ieee1394.wiki.kernel.org/index.php/Juju_Migration
+ before you enable the new stack.
To compile this driver as a module, say M here: the module will be
called firewire-core.

Privacy Policy