aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-09 11:37:00 +0000
committerMark Brown <broonie@linaro.org>2013-12-09 11:37:00 +0000
commiteed4bafd63b5584adb832a582a931ecba41dec55 (patch)
tree5855807caaf53aec80037b2635eb2e2c0744565b /drivers/char/Kconfig
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff)
parent2c06cb20454795a38876be5bd93dd6a8ddcc9d98 (diff)
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aosp
Diffstat (limited to 'drivers/char/Kconfig')
-rw-r--r--drivers/char/Kconfig17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 3bb6fa3930b..6fcb9b01e57 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
@@ -584,6 +597,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 MSM_SMD_PKT