aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-23 16:01:50 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-25 14:55:45 -0400
commit967857dfd990081f6702daebc6c9bc6f4ba7a39e (patch)
treec669fab32f7067b207d2089d5430108991c47af7
parent6f0c0580b70c89094b3422ba81118c7b959c7556 (diff)
drivers/base: remove CONFIG_EXPERIMENTAL
This config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it. CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/base/Kconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 08b4c5209384..e439ebca8377 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -57,7 +57,7 @@ config DEVTMPFS_MOUNT
57 on the rootfs is completely empty. 57 on the rootfs is completely empty.
58 58
59config STANDALONE 59config STANDALONE
60 bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL 60 bool "Select only drivers that don't need compile-time external firmware"
61 default y 61 default y
62 help 62 help
63 Select this option if you don't have magic firmware for drivers that 63 Select this option if you don't have magic firmware for drivers that
@@ -185,7 +185,6 @@ config DMA_SHARED_BUFFER
185 bool 185 bool
186 default n 186 default n
187 select ANON_INODES 187 select ANON_INODES
188 depends on EXPERIMENTAL
189 help 188 help
190 This option enables the framework for buffer-sharing between 189 This option enables the framework for buffer-sharing between
191 multiple drivers. A buffer is associated with a file using driver 190 multiple drivers. A buffer is associated with a file using driver
@@ -193,8 +192,8 @@ config DMA_SHARED_BUFFER
193 driver. 192 driver.
194 193
195config CMA 194config CMA
196 bool "Contiguous Memory Allocator (EXPERIMENTAL)" 195 bool "Contiguous Memory Allocator"
197 depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK && EXPERIMENTAL 196 depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK
198 select MIGRATION 197 select MIGRATION
199 select MEMORY_ISOLATION 198 select MEMORY_ISOLATION
200 help 199 help