rpms/kernel/devel/configs config-x86_64-generic,1.22,1.23

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	config-x86_64-generic 
Log Message:
* Tue Nov 15 2005 Dave Jones <davej at redhat.com>
- 2.6.15-rc1-git3



Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config-x86_64-generic	15 Nov 2005 01:10:15 -0000	1.22
+++ config-x86_64-generic	15 Nov 2005 17:23:57 -0000	1.23
@@ -7,6 +7,7 @@
 CONFIG_MTRR=y
 CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_NR_CPUS=256
 CONFIG_GART_IOMMU=y
@@ -118,6 +119,7 @@
 CONFIG_CRYPTO_AES_X86_64=m
 
 CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
 
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set