rpms/kernel/devel config-s390x,1.25,1.26 kernel.spec,1.2040,1.2041

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31793

Modified Files:
	config-s390x kernel.spec 
Log Message:
* Wed Jun 23 2010 Kyle McMartin <kyle at redhat.com>
- Override generic's CONFIG_HZ_1000 on s390.



Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- config-s390x	22 Jun 2010 16:01:45 -0000	1.25
+++ config-s390x	23 Jun 2010 10:56:46 -0000	1.26
@@ -9,6 +9,7 @@ CONFIG_COMPAT=y
 
 # See bug 496596
 CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
 # See bug 496605
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2040
retrieving revision 1.2041
diff -u -p -r1.2040 -r1.2041
--- kernel.spec	23 Jun 2010 04:32:58 -0000	1.2040
+++ kernel.spec	23 Jun 2010 10:56:46 -0000	1.2041
@@ -1906,6 +1906,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Wed Jun 23 2010 Kyle McMartin <kyle at redhat.com>
+- Override generic's CONFIG_HZ_1000 on s390.
+
 * Tue Jun 22 2010 Dave Jones <davej at redhat.com>
 - Fix localhost networking.