diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 20:52:07 +0200 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 22:50:41 +0200 |
commit | 020abf03cd659388f94cb328e1e1df0656e0d7ff (patch) | |
tree | 40d05011708ad1b4a05928d167eb120420581aa6 /drivers/firewire/Kconfig | |
parent | firewire: ohci: optimize find_branch_descriptor() (diff) | |
parent | Linux 2.6.39-rc7 (diff) | |
download | linux-020abf03cd659388f94cb328e1e1df0656e0d7ff.tar.xz linux-020abf03cd659388f94cb328e1e1df0656e0d7ff.zip |
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.
Diffstat (limited to 'drivers/firewire/Kconfig')
-rw-r--r-- | drivers/firewire/Kconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index 49009b489f37..2be6f4520772 100644 --- a/drivers/firewire/Kconfig +++ b/drivers/firewire/Kconfig @@ -49,15 +49,13 @@ config FIREWIRE_SBP2 configuration section. config FIREWIRE_NET - tristate "IP networking over 1394 (EXPERIMENTAL)" - depends on FIREWIRE && INET && EXPERIMENTAL + tristate "IP networking over 1394" + depends on FIREWIRE && INET help This enables IPv4 over IEEE 1394, providing IP connectivity with other implementations of RFC 2734 as found on several operating systems. Multicast support is currently limited. - NOTE, this driver is not stable yet! - To compile this driver as a module, say M here: The module will be called firewire-net. |