Merge branch 'master'

1 files changed, 14 insertions, 0 deletions

diff --git a/block/Kconfig b/block/Kconfig
new file mode 100644
index 000000000000..eb48edb80c1d
--- /dev/null
+++ b/block/Kconfig
@@ -0,0 +1,14 @@
+#
+# Block layer core configuration
+#
+#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
+#for instance.
+config LBD
+        bool "Support for Large Block Devices"
+        depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
+        help
+          Say Y here if you want to attach large (bigger than 2TB) discs to
+          your machine, or if you want to have a raid or loopback device
+          bigger than 2TB.  Otherwise say N.
+
+source block/Kconfig.iosched