Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

[pandora-kernel.git] / fs / exofs / Kconfig

diff --git a/fs/exofs/Kconfig b/fs/exofs/Kconfig
index 70bae41..da42f32 100644 (file)
--- a/fs/exofs/Kconfig
+++ b/fs/exofs/Kconfig
@@ -1,10 +1,17 @@
+# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects
+# for every ORE user we do it like this. Any user should add itself here
+# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are
+# selected here, and we default to "ON". So in effect it is like been
+# selected by any of the users.
 config ORE
        tristate
+       depends on EXOFS_FS || PNFS_OBJLAYOUT
+       select ASYNC_XOR
+       default SCSI_OSD_ULD
 
 config EXOFS_FS
        tristate "exofs: OSD based file system support"
        depends on SCSI_OSD_ULD
-       select ORE
        help
          EXOFS is a file system that uses an OSD storage device,
          as its backing storage.