Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index fcf3ea28340b..2be6f4520772 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -3,9 +3,6 @@ menu "IEEE 1394 (FireWire) support"
         # firewire-core does not depend on PCI but is
         # not useful without PCI controller driver
 
-comment "You can enable one or both FireWire driver stacks."
-comment "The newer stack is recommended."
-
 config FIREWIRE
         tristate "FireWire driver stack"
         select CRC_ITU_T
@@ -22,7 +19,7 @@ config FIREWIRE
 
 config FIREWIRE_OHCI
         tristate "OHCI-1394 controllers"
-        depends on PCI && FIREWIRE
+        depends on PCI && FIREWIRE && MMU
         help
           Enable this driver if you have a FireWire controller based
           on the OHCI specification.  For all practical purposes, this
@@ -52,20 +49,16 @@ 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.
 
-source "drivers/ieee1394/Kconfig"
-
 config FIREWIRE_NOSY
         tristate "Nosy - a FireWire traffic sniffer for PCILynx cards"
         depends on PCI
@@ -82,7 +75,8 @@ config FIREWIRE_NOSY
           The following cards are known to be based on PCILynx or PCILynx-2:
           IOI IOI-1394TT (PCI card), Unibrain Fireboard 400 PCI Lynx-2
           (PCI card), Newer Technology FireWire 2 Go (CardBus card),
-          Apple Power Mac G3 blue & white (onboard controller).
+          Apple Power Mac G3 blue & white and G4 with PCI graphics
+          (onboard controller).
 
           To compile this driver as a module, say M here:  The module will be
           called nosy.  Source code of a userspace interface to nosy, called