Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / staging / zram / Kconfig

diff --git a/drivers/staging/zram/Kconfig b/drivers/staging/zram/Kconfig
index da079f8d6e3dd9e8ad2dd5fa33b29b3174b1f3a6..3bec4dba3fe5d656681e8365734beb172a27ac12 100644 (file)
--- a/drivers/staging/zram/Kconfig
+++ b/drivers/staging/zram/Kconfig
@@ -1,6 +1,11 @@
+config XVMALLOC
+       bool
+       default n
+
 config ZRAM
        tristate "Compressed RAM block device support"
-       depends on BLOCK
+       depends on BLOCK && SYSFS
+       select XVMALLOC
        select LZO_COMPRESS
        select LZO_DECOMPRESS
        default n
@@ -15,3 +20,11 @@ config ZRAM
 
          See zram.txt for more information.
          Project home: http://compcache.googlecode.com/
+
+config ZRAM_DEBUG
+       bool "Compressed RAM block device debug support"
+       depends on ZRAM
+       default n
+       help
+         This option adds additional debugging code to the compressed
+         RAM block device driver.