Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 39142e2f804b..79b81be67975 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -4,7 +4,7 @@ menu "IEEE 1394 (FireWire) support"
 
 config IEEE1394
         tristate "IEEE 1394 (FireWire) support"
-        depends on PCI || BROKEN
+        depends on (PCI || BROKEN) && (BROKEN || !FRV)
         select NET
         help
           IEEE 1394 describes a high performance serial bus, which is also
@@ -128,8 +128,17 @@ config IEEE1394_SBP2
           1394 bus.  SBP-2 devices include harddrives and DVD devices.
 
 config IEEE1394_SBP2_PHYS_DMA
-        bool "Enable Phys DMA support for SBP2 (Debug)"
-        depends on IEEE1394 && IEEE1394_SBP2
+        bool "Enable replacement for physical DMA in SBP2"
+        depends on IEEE1394 && IEEE1394_SBP2 && EXPERIMENTAL && (X86_32 || PPC_32)
+        help
+          This builds sbp2 for use with non-OHCI host adapters which do not
+          support physical DMA or for when ohci1394 is run with phys_dma=0.
+          Physical DMA is data movement without assistence of the drivers'
+          interrupt handlers.  This option includes the interrupt handlers
+          that are required in absence of this hardware feature.
+
+          This option is buggy and currently broken on some architectures.
+          If unsure, say N.
 
 config IEEE1394_ETH1394
         tristate "Ethernet over 1394"