aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authormerge <null@invalid>2008-11-27 08:37:56 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-27 08:37:56 +0000
commita560d8579b4b009f847972667b7597c89030e26c (patch)
tree31dc5e17d93057b2e9290720a8b1f453201dead2 /init
parente21ce7019cc3b9495be8678ef2c41569cc03021e (diff)
MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-config-gta02-uplevel-patch
balaji-tracking-hist top was MERGE-via-stable-tracking-hist-config-gta02-uplevel-patch / eb381acecca375d0a7b88cfe640504a8a1fa4c39 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-config-gta02-uplevel-patch stable-tracking-hist top was config-gta02-uplevel-patch / 0e07e39074bbdb938cfefaea6ad7823282cc914c ... parent commitmessage: From: Andy Green <andy@openmoko.com> config-gta02-uplevel.patch Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig9
1 files changed, 0 insertions, 9 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 4fe525fac89..e0db6566952 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -741,15 +741,6 @@ config ASHMEM
POSIX SHM but with different behavior and sporting a simpler
file-based API.
-config ASHMEM
- bool "Enable Android's Shared Memory Subsystem"
- default n
- depends on SHMEM || TINY_SHMEM
- help
- The ashmem subsystem is a new shared memory allocator, similar to
- POSIX SHM but with different behavior and sporting a simpler
- file-based API.
-
config VM_EVENT_COUNTERS
default y
bool "Enable VM event counters for /proc/vmstat" if EMBEDDED