[kernel] r10782 - in dists/trunk/linux-2.6/debian/config: amd64 i386

[Maximilian Attems]

Author: maks
Date: Tue Mar 11 12:58:03 2008
New Revision: 10782

Log:
Revert "configs DEBUG_BOOT_PARAMS is x86 specific"

This reverts commit f27ce1a3bddfddb2a10a3cccff0af756433a0ed3.
wrong merge guess by git, already done in between by waldi.


Modified:
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Tue Mar 11 12:58:03 2008
@@ -1269,7 +1269,6 @@
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_LOCK_STAT is not set
 CONFIG_GENERIC_PENDING_IRQ=y

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Tue Mar 11 12:58:03 2008
@@ -1507,7 +1507,6 @@
 CONFIG_LEDS_WRAP=m
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set