samsung update 1

1 files changed, 47 insertions, 0 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 49502bc..ef176ae 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -6,6 +6,19 @@ menu "Character devices"
 
 source "drivers/tty/Kconfig"
 
+config DEVMEM
+	bool "Memory device driver"
+	default y
+	help
+	  The memory driver provides two character devices, mem and kmem, which
+	  provide access to the system's memory. The mem device is a view of
+	  physical memory, and each byte in the device corresponds to the
+	  matching physical address. The kmem device is the same as mem, but
+	  the addresses correspond to the kernel's virtual address space rather
+	  than physical memory. These devices are standard parts of a Linux
+	  system and most users should say Y here. You might say N if very
+	  security conscience or memory is tight.
+
 config DEVKMEM
 	bool "/dev/kmem virtual device support"
 	default y
@@ -598,6 +611,10 @@ config DEVPORT
 	depends on ISA || PCI
 	default y
 
+config DCC_TTY
+	tristate "DCC tty driver"
+	depends on ARM
+
 source "drivers/s390/char/Kconfig"
 
 config RAMOOPS
@@ -608,6 +625,36 @@ config RAMOOPS
 	  This enables panic and oops messages to be logged to a circular
 	  buffer in RAM where it can be read back at some later point.
 
+config S3C_MEM
+	bool "Support for /dev/s3c-mem"
+	default y
+	---help---
+	  If you do say Y here, you can allocate physically linear memories from system memory.
+	  And you can share the memory at the other process using re-allocation ioctl.
+
+	  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
+	help
+	  If you do say Y here, you can mmap using physically linear memories.
+	  And you can flush it using ioctl.
+
 config MSM_SMD_PKT
 	bool "Enable device interface for some SMD packet ports"
 	default n