[kernel] r13643 - in dists/trunk/linux-2.6/debian/config: amd64 kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Wed May 20 14:18:10 2009
New Revision: 13643

Log:
* debian/config/amd64/config.amd64: Remove options.
* debian/config/kernelarch-x86/config-arch-64: Add further options.

Modified:
   dists/trunk/linux-2.6/debian/config/amd64/config.amd64
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux-2.6/debian/config/amd64/config.amd64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config.amd64	Wed May 20 14:13:39 2009	(r13642)
+++ dists/trunk/linux-2.6/debian/config/amd64/config.amd64	Wed May 20 14:18:10 2009	(r13643)
@@ -1,29 +1,4 @@
 ##
-## file: arch/x86/Kconfig
-##
-CONFIG_SMP=y
-CONFIG_NR_CPUS=512
-CONFIG_X86_MCE_AMD=y
-CONFIG_NUMA=y
-CONFIG_K8_NUMA=y
-CONFIG_X86_64_ACPI_NUMA=y
-# CONFIG_NUMA_EMU is not set
-
-##
-## file: arch/x86/Kconfig.cpu
-##
-## choice: Processor family
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-CONFIG_GENERIC_CPU=y
-## end choice
-
-##
-## file: drivers/acpi/Kconfig
-##
-CONFIG_ACPI_NUMA=y
-
-##
 ## file: drivers/char/Kconfig
 ##
 CONFIG_DIGIEPCA=m
@@ -39,13 +14,3 @@
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_MAVEN=m
 
-##
-## file: mm/Kconfig
-##
-## choice: Memory model
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-## end choice
-CONFIG_MIGRATION=y
-

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Wed May 20 14:13:39 2009	(r13642)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Wed May 20 14:18:10 2009	(r13643)
@@ -2,15 +2,31 @@
 ## file: arch/x86/Kconfig
 ##
 CONFIG_64BIT=y
+CONFIG_SMP=y
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_AMD_IOMMU=y
 # CONFIG_AMD_IOMMU_STATS is not set
 # CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=512
 CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_NUMA=y
+CONFIG_K8_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+# CONFIG_NUMA_EMU is not set
 CONFIG_PCI_MMCONFIG=y
 
 ##
+## file: arch/x86/Kconfig.cpu
+##
+## choice: Processor family
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+CONFIG_GENERIC_CPU=y
+## end choice
+
+##
 ## file: arch/x86/kernel/cpu/cpufreq/Kconfig
 ##
 CONFIG_X86_POWERNOW_K8=m
@@ -20,3 +36,13 @@
 ##
 CONFIG_XEN_MAX_DOMAIN_MEMORY=32
 
+##
+## file: mm/Kconfig
+##
+## choice: Memory model
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+## end choice
+CONFIG_MIGRATION=y
+