Merge tag 'for-linus-v3.6-rc4' of git://oss.sgi.com/xfs/xfs

[cascardo/linux.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index e97934e..09acf1b 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -99,6 +99,12 @@ config BLK_DEV_THROTTLING
 
        See Documentation/cgroups/blkio-controller.txt for more information.
 
+menu "Partition Types"
+
+source "block/partitions/Kconfig"
+
+endmenu
+
 endif # BLOCK
 
 config BLOCK_COMPAT