rpms/kernel-xen/devel/configs config-generic, 1.3, 1.4 config-i586, 1.2, 1.3 config-ia64-generic, 1.3, 1.4 config-powerpc-generic, 1.3, 1.4 config-powerpc32-generic, 1.2, 1.3 config-powerpc64, 1.2, 1.3 config-powerpc64-iseries, 1.3, 1.4 config-x86-generic, 1.4, 1.5 config-x86_64-generic, 1.4, 1.5

Thu Jan 26 22:14:37 UTC 2006

Author: quintela

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

Modified Files:
	config-generic config-i586 config-ia64-generic 
	config-powerpc-generic config-powerpc32-generic 
	config-powerpc64 config-powerpc64-iseries config-x86-generic 
	config-x86_64-generic 
Log Message:
rebase with rawhide 1.1869


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- config-generic	9 Jan 2006 20:42:19 -0000	1.3
+++ config-generic	26 Jan 2006 22:14:35 -0000	1.4
@@ -5,7 +5,7 @@
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_LOCALVERSION=""
-
+# CONFIG_CRASH_DUMP is not set
 #
 # Code maturity level options
 #
@@ -115,6 +115,8 @@
 #
 CONFIG_FW_LOADER=y
 
+# CONFIG_SPI is not set
+
 #
 # Memory Technology Devices (MTD)
 #
@@ -461,7 +463,8 @@
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_QLA2XXX=m
+CONFIG_SCSI_QLA_FC=m
+# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
 CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
@@ -549,6 +552,7 @@
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set
 
 #
 # Networking support
@@ -630,6 +634,30 @@
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
 
@@ -668,6 +696,7 @@
 CONFIG_IP_NF_MATCH_DCCP=m
 CONFIG_IP_NF_MATCH_CONNBYTES=m
 CONFIG_IP_NF_MATCH_STRING=m
+CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_TARGET_CONNMARK=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -729,6 +758,7 @@
 CONFIG_IP6_NF_MATCH_LENGTH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_PHYSDEV=m
+CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
@@ -795,6 +825,13 @@
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
 #
+# TIPC Configuration (EXPERIMENTAL)
+#
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+
+#
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
@@ -973,6 +1010,7 @@
 CONFIG_DL2K=m
 CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -982,6 +1020,7 @@
 # CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 CONFIG_TIGON3=m
+CONFIG_SKY2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1041,8 +1080,9 @@
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 # CONFIG_IPW2100 is not set
-# CONFIG_IPW_DEBUG is not set
 # CONFIG_IPW2200 is not set
+# CONFIG_IPW2100_DEBUG is not set
+# CONFIG_IPW2200_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1068,6 +1108,7 @@
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_CS=m
 
 #
@@ -1366,12 +1407,13 @@
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_ROCKETPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
-CONFIG_N_HDLC=m
-CONFIG_STALDRV=y
+# CONFIG_SYNCLINK_GT is not set
+# CONFIG_N_HDLC is not set
+# CONFIG_STALDRV is not set
 # CONFIG_FTAPE is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_TCG_TPM is not set
@@ -1388,7 +1430,7 @@
 CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -1509,6 +1551,7 @@
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT8231=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
@@ -1571,6 +1614,7 @@
 CONFIG_W83977F_WDT=m
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_USBPCWATCHDOG=m
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
 
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
@@ -1623,6 +1667,7 @@
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
 
 #
 # Video For Linux
@@ -1642,6 +1687,7 @@
 CONFIG_VIDEO_CX88=m
 CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
+CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_VIDEO_DECODER=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_EM28XX=m
@@ -1738,6 +1784,7 @@
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
 CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_DIGITV=m
@@ -1856,6 +1903,8 @@
 CONFIG_SND_RTCTIMER=m
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
 
 #
 # Generic devices
@@ -1880,12 +1929,14 @@
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS4281=m
+CONFIG_SND_CS5535AUDIO=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_CA0106=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_NM256=m
 CONFIG_SND_RME32=m
+CONFIG_SND_PCXHR=m
 CONFIG_SND_RME96=m
 CONFIG_SND_RME9652=m
 CONFIG_SND_HDSP=m
@@ -1985,6 +2036,7 @@
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_USBAT=y
 CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_ALAUDA=y
 CONFIG_USB_LIBUSUAL=y
 
 #
@@ -2005,7 +2057,9 @@
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
 CONFIG_USB_AIPTEK=m
+
 CONFIG_USB_WACOM=m
+
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
 CONFIG_USB_XPAD=m
@@ -2142,6 +2196,7 @@
 # CONFIG_USB_FILE_STORAGE_TEST is not set
 CONFIG_USB_MTOUCH=m
 CONFIG_USB_ATI_REMOTE=m
+CONFIG_USB_ATI_REMOTE2=m
 CONFIG_USB_ALI_M5632=y
 # CONFIG_USB_CYTHERM is not set
 CONFIG_USB_EGALAX=m
@@ -2157,6 +2212,7 @@
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_XUSBATM=m
+CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
@@ -2301,6 +2357,9 @@
 # CONFIG_AFS_FS is not set
 # CONFIG_RXRPC is not set
 
+CONFIG_OCFS2_FS=m
+CONFIG_CONFIGFS_FS=m
+
 #
 # Partition Types
 #
@@ -2320,6 +2379,8 @@
 # CONFIG_ULTRIX_PARTITION is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_EFI_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+
 CONFIG_NLS=y
 
 #
@@ -2383,12 +2444,13 @@
 # CONFIG_FRAME_POINTER is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_VM is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_RODATA is not set
 
 # Turn off these debug options for production kernels.
 CONFIG_DEBUG_SLAB=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_VM=y
 CONFIG_KMALLOC_ACCOUNTING=y
 
 # CONFIG_WAKEUP_TIMING is not set
@@ -2405,6 +2467,7 @@
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2631,3 +2694,9 @@
 # CONFIG_SND_PDAUDIOCF is not set
 
 ## END of ISA options.
+
+# FIXME: This needs to be made to depend on PPC
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+
+# CONFIG_FORCED_INLINING is not set
+


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-i586,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-i586	21 Dec 2005 11:24:56 -0000	1.2
+++ config-i586	26 Jan 2006 22:14:35 -0000	1.3
@@ -43,7 +43,6 @@
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_SONYPI is not set
-# CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_HPET is not set
 # CONFIG_W1 is not set
@@ -53,3 +52,15 @@
 # CONFIG_MMC is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_KPROBES is not set
+CONFIG_AGP=y
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+# CONFIG_AGP_AMD64 is not set
+CONFIG_AGP_INTEL=y
+# CONFIG_AGP_NVIDIA is not set
+# CONFIG_AGP_SIS is not set
+# CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_VIA is not set
+# CONFIG_AGP_EFFICEON is not set
+


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-ia64-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-ia64-generic	9 Jan 2006 20:42:19 -0000	1.3
+++ config-ia64-generic	26 Jan 2006 22:14:35 -0000	1.4
@@ -157,3 +157,8 @@
 CONFIG_IA64_ACPI_CPUFREQ=m
 
 # CONFIG_CRASH is not set
+
+CONFIG_SERIAL_SGI_IOC3=m
+CONFIG_SGI_IOC3=m
+
+


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-powerpc-generic	9 Jan 2006 20:42:19 -0000	1.3
+++ config-powerpc-generic	26 Jan 2006 22:14:35 -0000	1.4
@@ -40,7 +40,7 @@
 CONFIG_ADB=y
 CONFIG_ADB_PMU=y
 CONFIG_WINDFARM=y
-CONFIG_I2C_KEYWEST=y
+CONFIG_I2C_POWERMAC=y
 CONFIG_APPLE_AIRPORT=m
 CONFIG_SERIAL_PMACZILOG=m
 CONFIG_AGP_UNINORTH=y
@@ -80,3 +80,5 @@
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 
+CONFIG_USB_HIDINPUT_POWERBOOK=y
+


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc32-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-powerpc32-generic	21 Dec 2005 11:24:56 -0000	1.2
+++ config-powerpc32-generic	26 Jan 2006 22:14:35 -0000	1.3
@@ -4,6 +4,7 @@
 # CONFIG_RTAS_PROC is not set
 # CONFIG_PCMCIA_M8XX is not set
 # CONFIG_HOTPLUG_PCI is not set
+CONFIG_CLASSIC32=y
 CONFIG_CPU_FREQ_PMAC=y
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_PPC_CHRP=y


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-powerpc64	21 Dec 2005 11:24:56 -0000	1.2
+++ config-powerpc64	26 Jan 2006 22:14:35 -0000	1.3
@@ -1,11 +1,13 @@
 CONFIG_WINDFARM_PM81=y
 CONFIG_WINDFARM_PM91=y
 CONFIG_PPC_PMAC64=y
-CONFIG_PPC_MAPLE=y
+# CONFIG_PPC_MAPLE is not set
 CONFIG_PPC_CELL=y
 # CONFIG_PPC_ISERIES is not set
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
+CONFIG_IBMEBUS=y
+CONFIG_SPU_FS=m
 CONFIG_RTAS_FLASH=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_SCANLOG=y


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc64-iseries,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-powerpc64-iseries	9 Jan 2006 20:42:19 -0000	1.3
+++ config-powerpc64-iseries	26 Jan 2006 22:14:35 -0000	1.4
@@ -47,13 +47,6 @@
 # CONFIG_SCHED_SMT is not set
 # CONFIG_XMON is not set
 # CONFIG_ROCKETPORT is not set
-
-# Disabled due to compile failure 2005-09-21 (dwmw2)
-# drivers/infiniband/hw/mthca/mthca_cmd.c: In function 'mthca_cmd_poll':
-# drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: syntax error before 'do'
-# drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: called object '"i"' is not a function
-# CONFIG_INFINIBAND_MTHCA is not set
-
 # CONFIG_WINDFARM is not set
 CONFIG_LPARCFG=y
 CONFIG_HOTPLUG_PCI=y
@@ -66,6 +59,32 @@
 CONFIG_SERIAL_ICOM=m
 # CONFIG_ISDN is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_SND is not set
+# CONFIG_IRDA is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_PCCARD is not set
+# CONFIG_CARDBUS is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_ATM is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_I2C is not set
+# CONFIG_W1 is not set
+# CONFIG_HWMON is not set
+# CONFIG_SOUND is not set
+# CONFIG_MMC is not set
+# CONFIG_INFINIBAND is not set
 
 # CONFIG_DVB is not set
 # CONFIG_VIDEO_DEV is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-x86-generic	9 Jan 2006 20:42:19 -0000	1.4
+++ config-x86-generic	26 Jan 2006 22:14:35 -0000	1.5
@@ -204,10 +204,12 @@
 CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_4KSTACKS=y
 CONFIG_KPROBES=y
 
+# FIXME: Disable before release.
+CONFIG_DEBUG_PAGEALLOC=y
+
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_BIOS=y
@@ -263,7 +265,6 @@
 
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_PHYSICAL_START=0x100000
-# CONFIG_CRASH_DUMP is not set
 
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
@@ -272,4 +273,15 @@
 CONFIG_LATENCY_TIMING=y
 CONFIG_LATENCY_TRACE=y
 CONFIG_MCOUNT=y
+CONFIG_CS5535_GPIO=m
+
+CONFIG_EDAC=y
+CONFIG_EDAC_DEBUG=y
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_I82860=m
+CONFIG_EDAC_R82600=m
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86_64-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-x86_64-generic	9 Jan 2006 20:42:19 -0000	1.4
+++ config-x86_64-generic	26 Jan 2006 22:14:35 -0000	1.5
@@ -148,3 +148,13 @@
 
 CONFIG_NVRAM=m
 
+CONFIG_EDAC=y
+CONFIG_EDAC_DEBUG=y
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_I82860=m
+CONFIG_EDAC_R82600=m
+


