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

[Ben Hutchings]

Author: benh
Date: Tue Jan 15 15:14:14 2013
New Revision: 19734

Log:
[!x86] Disable ZRAM, ZSMALLOC as modules (Reopens: #676779), as they really aren't portable yet.

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Jan 15 13:13:50 2013	(r19733)
+++ dists/trunk/linux/debian/changelog	Tue Jan 15 15:14:14 2013	(r19734)
@@ -11,6 +11,8 @@
     size limit (fixes FTBFS)
   * ALSA: usb-audio: Avoid autopm calls after disconnection; Fix missing
     autopm for MIDI input (Closes: #664068)
+  * [!x86] Disable ZRAM, ZSMALLOC as modules (Reopens: #676779), as they
+    really aren't portable yet.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 06 Jan 2013 04:39:12 +0000
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Tue Jan 15 13:13:50 2013	(r19733)
+++ dists/trunk/linux/debian/config/config	Tue Jan 15 15:14:14 2013	(r19734)
@@ -3055,16 +3055,6 @@
 # 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
 ##
 CONFIG_TARGET_CORE=m

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Tue Jan 15 13:13:50 2013	(r19733)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Tue Jan 15 15:14:14 2013	(r19734)
@@ -1420,6 +1420,16 @@
 CONFIG_PRISM2_USB=m
 
 ##
+## file: drivers/staging/zram/Kconfig
+##
+CONFIG_ZRAM=m
+
+##
+## file: drivers/staging/zsmalloc/Kconfig
+##
+CONFIG_ZSMALLOC=m
+
+##
 ## file: drivers/thermal/Kconfig
 ##
 CONFIG_THERMAL=m