aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/Kconfig')
-rw-r--r--drivers/char/Kconfig16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ef176ae..ea75975 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -64,6 +64,8 @@ config SGI_MBCS
source "drivers/tty/serial/Kconfig"
+source "drivers/char/diag/Kconfig"
+
config TTY_PRINTK
bool "TTY driver to output user messages via printk"
depends on EXPERT
@@ -634,20 +636,6 @@ config S3C_MEM
If unsure, say Y.
-config S3C_MEM_CMA_ALLOC
- bool "Support for /dev/s3c-mem with CMA feature"
- depends on S3C_MEM && SLP
-
-config VIDEO_SAMSUNG_MEMSIZE_S3C_MEM_CMA
- int "Memory size in kbytes for S3C_MEM_CMA"
- depends on S3C_MEM_CMA_ALLOC
- default "24576"
-
-config VIDEO_SAMSUNG_SLOTSIZE_S3C_MEM_CMA
- int "Slot size in kbytes for S3C_MEM_CMA slot"
- depends on S3C_MEM_CMA_ALLOC
- default "1024"
-
config EXYNOS_MEM
bool "Support for /dev/exynos-mem"
default y