rpms/kernel/devel/configs config-generic, 1.124, 1.125 config-s390-generic, 1.7, 1.8

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	config-generic config-s390-generic 
Log Message:
* Sat Jan 07 2006 Dave Jones <davej at redhat.com>
- 2.6.15-git3



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- config-generic	6 Jan 2006 15:02:01 -0000	1.124
+++ config-generic	8 Jan 2006 01:59:04 -0000	1.125
@@ -550,6 +550,7 @@
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set
 
 #
 # Networking support
@@ -1512,6 +1513,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
@@ -2646,4 +2648,3 @@
 
 ## END of ISA options.
 
-


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-s390-generic	19 Sep 2005 20:12:04 -0000	1.7
+++ config-s390-generic	8 Jan 2006 01:59:04 -0000	1.8
@@ -135,8 +135,10 @@
 #
 # S390 crypto hw
 #
-CONFIG_CRYPTO_SHA1_Z990=m
-CONFIG_CRYPTO_DES_Z990=m
+CONFIG_CRYPTO_SHA1_S390=m
+CONFIG_CRYPTO_SHA256_S390=m
+CONFIG_CRYPTO_DES_S390=m
+CONFIG_CRYPTO_AES_S390=m
 
 #
 # Kernel hacking
@@ -171,4 +173,3 @@
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MII is not set
 
-