SOURCES: kernel-vanilla-multiarch.conf - sort on x86_64

[glen]

Author: glen                         Date: Mon Feb  4 23:06:35 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- sort on x86_64

---- Files affected:
SOURCES:
   kernel-vanilla-multiarch.conf (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SOURCES/kernel-vanilla-multiarch.conf
diff -u SOURCES/kernel-vanilla-multiarch.conf:1.31 SOURCES/kernel-vanilla-multiarch.conf:1.32
--- SOURCES/kernel-vanilla-multiarch.conf:1.31	Mon Feb  4 23:14:19 2008
+++ SOURCES/kernel-vanilla-multiarch.conf	Tue Feb  5 00:06:30 2008
@@ -9,7 +9,9 @@
 X86 i386=y x86_64=y
 GENERIC_TIME all=y
 GENERIC_CMOS_UPDATE all=y
+CLOCKSOURCE_WATCHDOG x86_64=y i386=y
 GENERIC_CLOCKEVENTS all=y
+GENERIC_CLOCKEVENTS_BROADCAST x86_64=y i386=y
 LOCKDEP_SUPPORT all=y
 STACKTRACE_SUPPORT all=y
 SEMAPHORE_SLEEPERS i386=y x86_64=y
@@ -36,6 +38,7 @@
 GENERIC_IRQ_PROBE i386=y x86_64=y
 GENERIC_PENDING_IRQ i386=y x86_64=y
 KTIME_SCALAR i386=y x86_64=n
+DEFCONFIG_LIST all="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # General setup
@@ -170,11 +173,14 @@
 MCORE2 i386=n x86_64=n
 GENERIC_CPU x86_64=n i386=n
 X86_L1_CACHE_BYTES x86_64=64
+X86_INTERNODE_CACHE_BYTES x86_64=64
 X86_CMPXCHG x86_64=y i386=y
 X86_L1_CACHE_SHIFT i386=7 x86_64=6
 X86_GOOD_APIC x86_64=y i386=y
 X86_INTEL_USERCOPY i386=y x86_64=y
+X86_USE_PPRO_CHECKSUM x86_64=y i386=y
 X86_TSC x86_64=y i386=y
+X86_MINIMUM_CPU_FAMILY x86_64=64 i386=4
 HPET_TIMER i386=y x86_64=y
 HPET_EMULATE_RTC i386=y x86_64=y
 GART_IOMMU x86_64=y
@@ -232,10 +238,12 @@
 HOTPLUG_CPU i386=y x86_64=y ppc=y
 ARCH_ENABLE_MEMORY_HOTPLUG all=y
 HAVE_ARCH_EARLY_PFN_TO_NID x86_64=y
+OUT_OF_LINE_PFN_TO_PAGE x86_64=y
 
 #
 # Power management options
 #
+ARCH_HIBERNATION_HEADER x86_64=y
 PM all=y
 PM_LEGACY all=y
 PM_DEBUG all=n
@@ -249,6 +257,9 @@
 ACPI i386=y x86_64=y
 ACPI_SLEEP i386=y x86_64=y
 ACPI_PROCFS i386=y x86_64=y
+ACPI_PROCFS_POWER x86_64=y i386=y
+ACPI_SYSFS_POWER x86_64=y i386=y
+ACPI_PROC_EVENT x86_64=y i386=y
 ACPI_AC i386=m x86_64=m
 ACPI_BATTERY i386=m x86_64=m
 ACPI_BUTTON i386=m x86_64=m
@@ -256,7 +267,9 @@
 ACPI_DOCK i386=m x86_64=m
 ACPI_BAY i386=m x86_64=m
 ACPI_PROCESSOR i386=m x86_64=m
+ACPI_HOTPLUG_CPU x86_64=y i386=y
 ACPI_THERMAL i386=m x86_64=m
+ACPI_NUMA x86_64=y
 ACPI_ASUS i386=m x86_64=m
 ACPI_TOSHIBA i386=m x86_64=m
 ACPI_CUSTOM_DSDT i386=n x86_64=n
@@ -301,6 +314,7 @@
 #
 X86_ACPI_CPUFREQ_PROC_INTF i386=y x86_64=n
 X86_SPEEDSTEP_LIB i386=m x86_64=n
+CPU_IDLE x86_64=n i386=n
 
 #
 # Bus options (PCI etc.)
@@ -309,6 +323,7 @@
 PCI_DIRECT i386=y x86_64=y
 PCI_MMCONFIG i386=y x86_64=y
 PCI_DOMAINS ppc=y x86_64=y i386=y
+DMAR x86_64=n
 PCIEPORTBUS all=y
 HOTPLUG_PCI_PCIE all=m
 PCIEAER all=y
@@ -318,6 +333,7 @@
 PCI_DEBUG all=n
 HT_IRQ all=y
 ISA_DMA_API i386=y x86_64=y ppc=y
+K8_NB x86_64=y i386=y
 PCCARD all=m
 PCMCIA_DEBUG all=n
 PCMCIA all=m
@@ -354,6 +370,7 @@
 IA32_EMULATION x86_64=y
 IA32_AOUT x86_64=y
 COMPAT x86_64=y
+COMPAT_FOR_U64_ALIGNMENT x86_64=y
 SYSVIPC_COMPAT x86_64=y
 
 #
@@ -4185,22 +4202,6 @@
 #
 # New x86_64 symbols
 #
-CLOCKSOURCE_WATCHDOG x86_64=y i386=y
-GENERIC_CLOCKEVENTS_BROADCAST x86_64=y i386=y
-X86_INTERNODE_CACHE_BYTES x86_64=64
-X86_USE_PPRO_CHECKSUM x86_64=y i386=y
-X86_MINIMUM_CPU_FAMILY x86_64=64 i386=4
-OUT_OF_LINE_PFN_TO_PAGE x86_64=y
-ARCH_HIBERNATION_HEADER x86_64=y
-ACPI_PROCFS_POWER x86_64=y i386=y
-ACPI_SYSFS_POWER x86_64=y i386=y
-ACPI_PROC_EVENT x86_64=y i386=y
-ACPI_HOTPLUG_CPU x86_64=y i386=y
-ACPI_NUMA x86_64=y
-CPU_IDLE x86_64=n i386=n
-DMAR x86_64=n
-K8_NB x86_64=y i386=y
-COMPAT_FOR_U64_ALIGNMENT x86_64=y
 DMIID x86_64=y i386=y
 
 #
@@ -4209,11 +4210,6 @@
 PARAVIRT_GUEST i386=n
 
 #
-# New symbols
-#
-DEFCONFIG_LIST all="/lib/modules/$UNAME_RELEASE/.config"
-
-#
 # New alpha symbols
 #
 ALPHA_NAUTILUS alpha=n
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-vanilla-multiarch.conf?r1=1.31&r2=1.32&f=u