Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / base / Kconfig

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 08b4c520938463fd989bba879d791a3e418efd39..c8b453939da21eedcf6c8c1728051fef98900897 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -57,7 +57,7 @@ config DEVTMPFS_MOUNT
          on the rootfs is completely empty.
 
 config STANDALONE
-       bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
+       bool "Select only drivers that don't need compile-time external firmware"
        default y
        help
          Select this option if you don't have magic firmware for drivers that
@@ -185,7 +185,6 @@ config DMA_SHARED_BUFFER
        bool
        default n
        select ANON_INODES
-       depends on EXPERIMENTAL
        help
          This option enables the framework for buffer-sharing between
          multiple drivers. A buffer is associated with a file using driver
@@ -193,8 +192,8 @@ config DMA_SHARED_BUFFER
          driver.
 
 config CMA
-       bool "Contiguous Memory Allocator (EXPERIMENTAL)"
-       depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK && EXPERIMENTAL
+       bool "Contiguous Memory Allocator"
+       depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK
        select MIGRATION
        select MEMORY_ISOLATION
        help
@@ -236,7 +235,7 @@ config CMA_SIZE_PERCENTAGE
 
 choice
        prompt "Selected region size"
-       default CMA_SIZE_SEL_ABSOLUTE
+       default CMA_SIZE_SEL_MBYTES
 
 config CMA_SIZE_SEL_MBYTES
        bool "Use mega bytes value only"