rpms/kernel/devel config-generic, 1.182, 1.183 kernel.spec, 1.1039, 1.1040 config-rhel-x86-generic, 1.2, NONE

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4684

Modified Files:
	config-generic kernel.spec 
Removed Files:
	config-rhel-x86-generic 
Log Message:
config-rhel-x86-generic uses the same defaults that the regular config-x86-generic does.
kill it.




Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- config-generic	8 Oct 2008 22:27:33 -0000	1.182
+++ config-generic	10 Oct 2008 18:50:42 -0000	1.183
@@ -2120,7 +2120,7 @@
 CONFIG_CARDMAN_4040=m
 
 CONFIG_MWAVE=m
-# CONFIG_RAW_DRIVER is not set
+CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_HANGCHECK_TIMER=m
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1039
retrieving revision 1.1040
diff -u -r1.1039 -r1.1040
--- kernel.spec	10 Oct 2008 04:30:38 -0000	1.1039
+++ kernel.spec	10 Oct 2008 18:50:42 -0000	1.1040
@@ -503,7 +503,6 @@
 Source22: config-nodebug
 Source23: config-generic
 Source24: config-rhel-generic
-Source25: config-rhel-x86-generic
 
 Source30: config-x86-generic
 Source31: config-i586
@@ -1015,13 +1014,6 @@
     ./merge.pl config-rhel-generic $i.tmp > $i
     rm $i.tmp
   done
-  for i in kernel-%{version}-{i586,i686,i686-PAE,x86_64}*.config
-  do
-    echo i is this file  $i
-    mv $i $i.tmp
-    ./merge.pl config-rhel-x86-generic $i.tmp > $i
-    rm $i.tmp
-  done
 %endif
 
 #ApplyPatch git-linus.diff


--- config-rhel-x86-generic DELETED ---