rpms/kernel-xen/devel/configs config-x86_64-kdump, NONE, 1.1 config-generic, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: quintela

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

Modified Files:
	config-generic 
Added Files:
	config-x86_64-kdump 
Log Message:
merge with rawhide 1985


--- NEW FILE config-x86_64-kdump ---
# CONFIG_SMP is not set
CONFIG_CRASH_DUMP=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_PROC_VMCORE=y


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-generic	26 Jan 2006 22:14:35 -0000	1.4
+++ config-generic	2 Feb 2006 14:04:31 -0000	1.5
@@ -161,7 +161,7 @@
 # CONFIG_MTD_PNC2000 is not set
 CONFIG_MTD_SC520CDP=m
 CONFIG_MTD_NETSC520=m
-CONFIG_MTD_SBC_GXX=m
+# CONFIG_MTD_SBC_GXX is not set
 CONFIG_MTD_SCx200_DOCFLASH=m
 # CONFIG_MTD_AMD76XROM is not set
 CONFIG_MTD_SCB2_FLASH=m
@@ -464,7 +464,8 @@
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_QLA_FC=m
-# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
+# FIXME: Turn off for FC6 - Move to external firmware loader.
+CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y
 CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
@@ -1592,10 +1593,10 @@
 # CONFIG_WDT_501 is not set
 CONFIG_WDTPCI=m
 CONFIG_WDT_501_PCI=y
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
 CONFIG_I8XX_TCO=m
 # CONFIG_MIXCOMWD is not set
 # CONFIG_SCx200_WDT is not set
@@ -1603,14 +1604,14 @@
 CONFIG_W83877F_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_MACHZ_WDT=m
-CONFIG_SC520_WDT=m
+# CONFIG_SC520_WDT is not set
 CONFIG_ALIM7101_WDT=m
 CONFIG_ALIM1535_WDT=m
-CONFIG_SC1200_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_CPU5_WDT=m
+# CONFIG_SC1200_WDT is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_CPU5_WDT is not set
 CONFIG_I6300ESB_WDT=m
-CONFIG_SBC8360_WDT=m
+# CONFIG_SBC8360_WDT is not set
 CONFIG_W83977F_WDT=m
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_USBPCWATCHDOG=m
@@ -2076,6 +2077,7 @@
 CONFIG_USB_DABUSB=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
+CONFIG_USB_ET61X251=m
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
 CONFIG_USB_OV511=m