From d8240c3095874da5b310129ca0d78b4818f40e3e Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Mon, 25 Jun 2012 11:14:36 -0500 Subject: [PATCH] --- yaml --- r: 317534 b: refs/heads/master c: 6e2361720b9da9ec830d407da058ca1827e62b12 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/zcache/Kconfig | 5 +---- trunk/drivers/staging/zram/Kconfig | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8130734fd824..96b887e1ca56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c90e3e80b9751335cc98934ae32188fa7de6bccd +refs/heads/master: 6e2361720b9da9ec830d407da058ca1827e62b12 diff --git a/trunk/drivers/staging/zcache/Kconfig b/trunk/drivers/staging/zcache/Kconfig index 7048e01f0817..4881839be625 100644 --- a/trunk/drivers/staging/zcache/Kconfig +++ b/trunk/drivers/staging/zcache/Kconfig @@ -1,9 +1,6 @@ config ZCACHE bool "Dynamic compression of swap pages and clean pagecache pages" - # X86 dependency is because zsmalloc uses non-portable pte/tlb - # functions - depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86 - select ZSMALLOC + depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && ZSMALLOC=y select CRYPTO_LZO default n help diff --git a/trunk/drivers/staging/zram/Kconfig b/trunk/drivers/staging/zram/Kconfig index 9d11a4cb99b7..be5abe8e7943 100644 --- a/trunk/drivers/staging/zram/Kconfig +++ b/trunk/drivers/staging/zram/Kconfig @@ -1,9 +1,6 @@ config ZRAM tristate "Compressed RAM block device support" - # X86 dependency is because zsmalloc uses non-portable pte/tlb - # functions - depends on BLOCK && SYSFS && X86 - select ZSMALLOC + depends on BLOCK && SYSFS && ZSMALLOC select LZO_COMPRESS select LZO_DECOMPRESS default n