rpms/kernel/devel/configs config-generic, 1.280, 1.281 config-powerpc-generic, 1.36, 1.37 config-x86-generic, 1.74, 1.75 config-x86_64-generic, 1.61, 1.62

[fedora-cvs-commits at redhat.com]

Author: cebbert

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

Modified Files:
	config-generic config-powerpc-generic config-x86-generic 
	config-x86_64-generic 
Log Message:
rebase to 2.6.20-rc6-git1



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- config-generic	26 Jan 2007 22:46:56 -0000	1.280
+++ config-generic	30 Jan 2007 14:50:14 -0000	1.281
@@ -211,6 +211,7 @@
 #
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_CAFE is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_ONENAND is not set
@@ -534,6 +535,7 @@
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_DPT_I2O is not set
 CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_SEAGATE is not set
 
 #
 # PCMCIA SCSI adapter support


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- config-powerpc-generic	19 Dec 2006 18:55:12 -0000	1.36
+++ config-powerpc-generic	30 Jan 2007 14:50:14 -0000	1.37
@@ -184,4 +184,4 @@
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_SATA_INTEL_COMBINED is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
-
+CONFIG_MTD_PHYSMAP_OF=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- config-x86-generic	8 Jan 2007 01:41:22 -0000	1.74
+++ config-x86-generic	30 Jan 2007 14:50:14 -0000	1.75
@@ -317,3 +317,7 @@
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_NAND_CAFE=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- config-x86_64-generic	13 Dec 2006 19:11:14 -0000	1.61
+++ config-x86_64-generic	30 Jan 2007 14:50:14 -0000	1.62
@@ -200,3 +200,6 @@
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m