[kernel] r19477 - in dists/trunk/linux/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Thu Nov  1 14:20:16 2012
New Revision: 19477

Log:
[x86] staging: Re-enable ZSMALLOC as module, previously selected by ZRAM but now a dependency (Closes: #692024)

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Thu Nov  1 06:00:12 2012	(r19476)
+++ dists/trunk/linux/debian/changelog	Thu Nov  1 14:20:16 2012	(r19477)
@@ -1,7 +1,12 @@
 linux (3.6.4-1~experimental.2) UNRELEASED; urgency=low
 
+  [ Uwe Kleine-König ]
   * [rt] bump to 3.6.4-rt10
 
+  [ Ben Hutchings ]
+  * [x86] staging: Re-enable ZSMALLOC as module, previously selected by
+    ZRAM but now a dependency (Closes: #692024)
+
  -- Uwe Kleine-König <uwe at kleine-koenig.org>  Mon, 29 Oct 2012 15:50:12 +0100
 
 linux (3.6.4-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Thu Nov  1 06:00:12 2012	(r19476)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Thu Nov  1 14:20:16 2012	(r19477)
@@ -1381,6 +1381,11 @@
 CONFIG_PRISM2_USB=m
 
 ##
+## file: drivers/staging/zsmalloc/Kconfig
+##
+CONFIG_ZSMALLOC=m
+
+##
 ## file: drivers/staging/zram/Kconfig
 ##
 CONFIG_ZRAM=m