rpms/kernel/devel Makefile.config, 1.23, 1.24 kernel-2.6.spec, 1.1255, 1.1256

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
Don't build powernow-k6 on anything other than 586 kernels.




Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.config	18 Feb 2005 14:35:07 -0000	1.23
+++ Makefile.config	22 Apr 2005 04:01:52 -0000	1.24
@@ -6,7 +6,7 @@
 
 CONFIGFILES	= \
 	$(CFG)-i686.config $(CFG)-i686-smp.config \
-	$(CFG)-i586.config $(CFG)-i586-smp.config \
+	$(CFG)-i586.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-smp.config \
 	$(CFG)-ppc64iseries.config \
 	$(CFG)-s390.config $(CFG)-s390x.config \
@@ -68,9 +68,6 @@
 kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic 
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i586-smp.config: configs/config-i586-smp temp-x86-generic 
-	perl scripts/merge.pl $^ i386 > $@
-
 kernel-$(VERSION)-x86_64-smp.config: configs/config-x86_64-smp temp-x86_64-generic 
 	perl scripts/merge.pl $^ x86_64 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1255
retrieving revision 1.1256
diff -u -r1.1255 -r1.1256
--- kernel-2.6.spec	21 Apr 2005 06:26:20 -0000	1.1255
+++ kernel-2.6.spec	22 Apr 2005 04:01:52 -0000	1.1256
@@ -1128,6 +1128,9 @@
 %endif
 
 %changelog
+* Fri Apr 22 2005 Dave Jones <davej at redhat.com>
+- Don't build powernow-k6 on anything other than 586 kernels.
+
 * Wed Apr 20 2005 Dave Jones <davej at redhat.com>
 - 2.6.12rc3