diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 08:46:28 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 08:46:28 -0700 |
commit | 94b086b243e112030b815b76e61de6523e6fc700 (patch) | |
tree | 3c7f2308e7e5afdb276a858c4960754168a92d8c /drivers/base/Kconfig | |
parent | 967857dfd990081f6702daebc6c9bc6f4ba7a39e (diff) | |
parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
download | linux-94b086b243e112030b815b76e61de6523e6fc700.tar.bz2 |
Merge 3.7-rc3 into driver-core-next
This pulls in the various driver core changes that were in 3.7-rc3 into the
driver-core-next branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/Kconfig')
-rw-r--r-- | drivers/base/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index e439ebca8377..c8b453939da2 100644 --- 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" |