rpms/kernel/devel/configs config-x86_64-generic,1.32,1.32.6.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Mar 6 15:49:36 UTC 2006


Author: sct

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15062/configs

Modified Files:
      Tag: private-xen-rebased-2009-branch
	config-x86_64-generic 
Log Message:
Merge with rawhide kernel 1.2016


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.32
retrieving revision 1.32.6.1
diff -u -r1.32 -r1.32.6.1
--- config-x86_64-generic	24 Feb 2006 19:13:38 -0000	1.32
+++ config-x86_64-generic	6 Mar 2006 15:49:34 -0000	1.32.6.1
@@ -10,14 +10,14 @@
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=255
 CONFIG_GART_IOMMU=y
 CONFIG_X86_POWERNOW_K8=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_DEBUG_RODATA=y
-CONFIG_MICROCODE=m 
+CONFIG_MICROCODE=m
 CONFIG_SWIOTLB=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_EDD=m
@@ -55,7 +55,7 @@
 CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_X86_SPEEDSTEP_CENTRINO=y
 CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y 
+CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -84,7 +84,7 @@
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m 
+CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=m




More information about the fedora-cvs-commits mailing list