From 476b0a12f5aa17913ce406549e075fb3efcf875c Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sat, 29 Dec 2012 18:02:45 +0000
Subject: Enable ZRAM, ZSMALLOC as modules on all architectures (Closes:
 #676779)

svn path=/dists/trunk/linux/; revision=19665
---
 debian/changelog                    |  1 +
 debian/config/config                | 10 ++++++++++
 debian/config/kernelarch-x86/config | 10 ----------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fafa43d5c8b..ae8b04bb9b2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ linux (3.7.1-1~experimental.2) UNRELEASED; urgency=low
     (Closes: #696664)
   * linux-headers-common: Do not use link-vmlinux.sh when cleaning external
     modules (Closes: #696775)
+  * Enable ZRAM, ZSMALLOC as modules on all architectures (Closes: #676779)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 29 Dec 2012 02:05:46 +0100
 
diff --git a/debian/config/config b/debian/config/config
index c3fe57708f25..31211c9dc245 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3054,6 +3054,16 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 ##
 # CONFIG_PRISM2_USB is not set
 
+##
+## file: drivers/staging/zram/Kconfig
+##
+CONFIG_ZRAM=m
+
+##
+## file: drivers/staging/zsmalloc/Kconfig
+##
+CONFIG_ZSMALLOC=m
+
 ##
 ## file: drivers/target/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index d8ecf67aa031..a4c66df59acf 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1419,16 +1419,6 @@ CONFIG_VT6656=m
 ##
 CONFIG_PRISM2_USB=m
 
-##
-## file: drivers/staging/zram/Kconfig
-##
-CONFIG_ZRAM=m
-
-##
-## file: drivers/staging/zsmalloc/Kconfig
-##
-CONFIG_ZSMALLOC=m
-
 ##
 ## file: drivers/thermal/Kconfig
 ##
-- 
cgit v1.2.3