diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/char/Kconfig | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/char/Kconfig')
| -rw-r--r-- | drivers/char/Kconfig | 16 |
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 |