Revert "Staging: ZRAM: Enable ZRAM"

This reverts commit ab3fdf31e9a4badbd52505ae1463a57cbf8459fb.

Reverting this commit to keep things similar to what upstream kernel
has.

bug 200031575

Change-Id: I5e6fb66fe7509f7db62f24a10a1356add8a292d8
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/486893
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>

diff --git a/drivers/staging/zram/Kconfig b/drivers/staging/zram/Kconfig
index bd6d4178e690330a44d381e353e15e6e6ad31eb7..983314c41349666c08213fe6f0dbd0e1509d4d9e 100644 (file)
--- a/drivers/staging/zram/Kconfig
+++ b/drivers/staging/zram/Kconfig
@@ -3,7 +3,7 @@ config ZRAM
        depends on BLOCK && SYSFS && ZSMALLOC
        select LZO_COMPRESS
        select LZO_DECOMPRESS
-       default y
+       default n
        help
          Creates virtual block devices called /dev/zramX (X = 0, 1, ...).
          Pages written to these disks are compressed and stored in memory

diff --git a/drivers/staging/zsmalloc/Kconfig b/drivers/staging/zsmalloc/Kconfig
index 2fbb21284ddab6d7dbacd95f1b22cf9b1c7d7504..7fab032298f33986cd55b518d3db60eebadb4d9b 100644 (file)
--- a/drivers/staging/zsmalloc/Kconfig
+++ b/drivers/staging/zsmalloc/Kconfig
@@ -1,6 +1,6 @@
 config ZSMALLOC
        bool "Memory allocator for compressed pages"
-       default y
+       default n
        help
          zsmalloc is a slab-based memory allocator designed to store
          compressed RAM pages.  zsmalloc uses virtual memory mapping