[kernel] r14607 - in dists/trunk/linux-2.6/debian: . config/armel

[Martin Michlmayr]

Author: tbm
Date: Thu Nov 12 18:06:20 2009
New Revision: 14607

Log:
[armel] Re-enable options that were turned off recently because of
size constraints

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armel/config.iop32x
   dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
   dists/trunk/linux-2.6/debian/config/armel/config.orion5x

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Nov 12 17:34:23 2009	(r14606)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Nov 12 18:06:20 2009	(r14607)
@@ -23,6 +23,9 @@
   * Add patch from Albin Tonnerre to add HAVE_KERNEL_LZMA to arm.
   * [armel] Enable KERNEL_LZMA, i.e. compress kernels with lzma to get
     much better compression.
+  * [armel] Re-enable options that were turned off recently because of
+    size constraints: DEBUG_USER, DEBUG_KERNEL, BOOT_TRACER, ARM_UNWIND,
+    BLK_DEV_IO_TRACE and SECURITY_SELINUX.
 
   [ maximilian attems ]
   * Simplify postinst nuke reverse symlinks handling. Patch from

Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Thu Nov 12 17:34:23 2009	(r14606)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Thu Nov 12 18:06:20 2009	(r14607)
@@ -41,13 +41,6 @@
 # CONFIG_ARTHUR is not set
 
 ##
-## file: arch/arm/Kconfig.debug
-##
-#. disabled because of size restrictions
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_DEBUG_USER is not set
-
-##
 ## file: arch/arm/mach-iop32x/Kconfig
 ##
 CONFIG_MACH_GLANTANK=y
@@ -703,20 +696,6 @@
 ## end choice
 
 ##
-## file: kernel/trace/Kconfig
-##
-#. disabled because of size restrictions
-# CONFIG_BOOT_TRACER is not set
-#. disabled because of size restrictions
-# CONFIG_BLK_DEV_IO_TRACE is not set
-
-##
-## file: lib/Kconfig.debug
-##
-#. disabled because of size restrictions
-# CONFIG_DEBUG_KERNEL is not set
-
-##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model
@@ -798,12 +777,6 @@
 # CONFIG_X25 is not set
 
 ##
-## file: security/selinux/Kconfig
-##
-#. disabled because of size restrictions
-# CONFIG_SECURITY_SELINUX is not set
-
-##
 ## file: sound/core/Kconfig
 ##
 CONFIG_SND_SEQUENCER=m

Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Thu Nov 12 17:34:23 2009	(r14606)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Thu Nov 12 18:06:20 2009	(r14607)
@@ -41,13 +41,6 @@
 # CONFIG_ARTHUR is not set
 
 ##
-## file: arch/arm/Kconfig.debug
-##
-#. disabled because of size restrictions
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_DEBUG_USER is not set
-
-##
 ## file: arch/arm/mach-ixp4xx/Kconfig
 ##
 CONFIG_MACH_NSLU2=y
@@ -782,20 +775,6 @@
 ## end choice
 
 ##
-## file: kernel/trace/Kconfig
-##
-#. disabled because of size restrictions
-# CONFIG_BOOT_TRACER is not set
-#. disabled because of size restrictions
-# CONFIG_BLK_DEV_IO_TRACE is not set
-
-##
-## file: lib/Kconfig.debug
-##
-#. disabled because of size restrictions
-# CONFIG_DEBUG_KERNEL is not set
-
-##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model
@@ -872,12 +851,6 @@
 CONFIG_X25=m
 
 ##
-## file: security/selinux/Kconfig
-##
-#. disabled because of size restrictions
-# CONFIG_SECURITY_SELINUX is not set
-
-##
 ## file: sound/core/Kconfig
 ##
 CONFIG_SND_SEQUENCER=m

Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Thu Nov 12 17:34:23 2009	(r14606)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Thu Nov 12 18:06:20 2009	(r14607)
@@ -560,14 +560,6 @@
 CONFIG_HIGH_RES_TIMERS=y
 
 ##
-## file: kernel/trace/Kconfig
-##
-#. disabled because of size restrictions
-# CONFIG_BOOT_TRACER is not set
-#. disabled because of size restrictions
-# CONFIG_BLK_DEV_IO_TRACE is not set
-
-##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model
@@ -601,12 +593,6 @@
 CONFIG_X25=m
 
 ##
-## file: security/selinux/Kconfig
-##
-#. disabled because of size restrictions
-# CONFIG_SECURITY_SELINUX is not set
-
-##
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y