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

[Ben Hutchings]

Author: benh
Date: Sun Apr  4 06:20:04 2010
New Revision: 15480

Log:
[x86] Enable ramzswap driver (Closes: #573912)

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Apr  4 00:45:13 2010	(r15479)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Apr  4 06:20:04 2010	(r15480)
@@ -6,6 +6,9 @@
   [ maximilian attems]
   * Add stable 2.6.33.2.
 
+  [ Ben Hutchings ]
+  * [x86] Enable ramzswap driver (Closes: #573912)
+
  -- Ian Campbell <ijc at hellion.org.uk>  Sat, 27 Mar 2010 08:09:28 +0000
 
 linux-2.6 (2.6.33-1~experimental.4) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Apr  4 00:45:13 2010	(r15479)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Apr  4 06:20:04 2010	(r15480)
@@ -1098,6 +1098,12 @@
 CONFIG_POHMELFS_CRYPTO=y
 
 ##
+## file: drivers/staging/ramzswap/Kconfig
+##
+CONFIG_RAMZSWAP=m
+CONFIG_RAMZSWAP_STATS=y
+
+##
 ## file: drivers/staging/rt2860/Kconfig
 ##
 CONFIG_RT2860=m