Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[mv-sheeva.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index d9d3dbabdb181df5e0b0ad35c278753f83725282..e7893b1d3e425767b5f765b8c829c401d7a4dea7 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -848,10 +848,6 @@ config RT_MUTEXES
        boolean
        select PLIST
 
-config TINY_SHMEM
-       default !SHMEM
-       bool
-
 config BASE_SMALL
        int
        default 0 if BASE_FULL