From a560d8579b4b009f847972667b7597c89030e26c Mon Sep 17 00:00:00 2001 From: merge Date: Thu, 27 Nov 2008 08:37:56 +0000 Subject: 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 MERGE-via-stable-tracking-hist-config-gta02-uplevel-patch stable-tracking-hist top was config-gta02-uplevel-patch / 0e07e39074bbdb938cfefaea6ad7823282cc914c ... parent commitmessage: From: Andy Green config-gta02-uplevel.patch Signed-off-by: Andy Green --- init/Kconfig | 9 --------- 1 file changed, 9 deletions(-) (limited to 'init') 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 -- cgit v1.2.3