[kernel] r6525 - in dists/sid/linux-2.6/debian: arch/arm

[Martin Michlmayr]

Author: tbm
Date: Wed May  3 17:35:26 2006
New Revision: 6525

Modified:
   dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/sid/linux-2.6/debian/arch/arm/config.rpc
   dists/sid/linux-2.6/debian/changelog

Log:
Enable cramfs for ixp4xx and rpc.


Modified: dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	Wed May  3 17:35:26 2006
@@ -1122,7 +1122,7 @@
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set

Modified: dists/sid/linux-2.6/debian/arch/arm/config.rpc
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.rpc	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.rpc	Wed May  3 17:35:26 2006
@@ -840,7 +840,7 @@
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed May  3 17:35:26 2006
@@ -1,6 +1,7 @@
 linux-2.6 (2.6.16-12) UNRELEASED; urgency=low
 
-  * Add stable release 2.6.16.12: 
+  [ Bastian Blank ]
+  * Add stable release 2.6.16.12:
     - dm snapshot: fix kcopyd destructor
     - x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
     - for_each_possible_cpu
@@ -26,11 +27,14 @@
     - cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
     - MIPS: Fix branch emulation for floating-point exceptions.
     - x86/PAE: Fix pte_clear for the >4GB RAM case
-  * Add stable release 2.6.16.13: 
+  * Add stable release 2.6.16.13:
     - NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527)
   * Remove merged patches.
   * Rediff xen patch.
 
+  [ Martin Michlmayr ]
+  * [arm] Enable cramfs for ixp4xx and rpc.
+
  -- Bastian Blank <waldi at debian.org>  Mon, 01 May 2006 22:52:43 +0200
 
 linux-2.6 (2.6.16-11) unstable; urgency=low