revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 8513290b9143e60dcb611fbdfba86cbe600e579d..9921944cbdefa40ba36daf4e3d9d33ccfc9603d7 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -791,12 +791,6 @@ config SYSCTL
 config ANON_INODES
        bool
 
-config PANIC_TIMEOUT
-       int "Default panic timeout"
-       default 0
-       help
-         Set default panic timeout.
-
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help
@@ -969,15 +963,6 @@ config SHMEM
          option replaces shmem and tmpfs with the much simpler ramfs code,
          which may be appropriate on small systems without swap.
 
-config ASHMEM
-       bool "Enable the Anonymous 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 AIO
        bool "Enable AIO support" if EMBEDDED
        default y