Merge 3.7-rc3 into driver-core-next

[firefly-linux-kernel-4.4.55.git] / drivers / base / Kconfig

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index e439ebca8377a0a31c2470e0a42c27bd41f00f50..c8b453939da21eedcf6c8c1728051fef98900897 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -235,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"