rpms/kernel/devel Makefile, 1.73, 1.74 config-debug, 1.13, 1.14 config-generic, 1.112, 1.113 config-nodebug, 1.15, 1.16 kernel.spec, 1.692, 1.693

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4240

Modified Files:
	Makefile config-debug config-generic config-nodebug 
	kernel.spec 
Log Message:
* Sat Jun 15 2008 Chuck Ebbert <cebbert at redhat.com>
- Enable Controller Area Networking (F8#451179)



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Makefile	27 May 2008 18:17:33 -0000	1.73
+++ Makefile	14 Jun 2008 08:05:27 -0000	1.74
@@ -62,6 +62,7 @@
 	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_FREE is not set/CONFIG_DEBUG_OBJECTS_FREE=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/CONFIG_DEBUG_OBJECTS_TIMERS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_X86_PTDUMP is not set/CONFIG_X86_PTDUMP=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=y/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
 
@@ -93,6 +94,7 @@
 	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_FREE=y/# CONFIG_DEBUG_OBJECTS_FREE is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_TIMERS=y/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_X86_PTDUMP=y/# CONFIG_X86_PTDUMP is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES is not set/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-debug	27 May 2008 18:17:33 -0000	1.13
+++ config-debug	14 Jun 2008 08:05:27 -0000	1.14
@@ -39,3 +39,5 @@
 CONFIG_DEBUG_OBJECTS_TIMERS=y
 
 CONFIG_X86_PTDUMP=y
+
+CONFIG_CAN_DEBUG_DEVICES=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- config-generic	13 Jun 2008 20:43:29 -0000	1.112
+++ config-generic	14 Jun 2008 08:05:27 -0000	1.113
@@ -1411,7 +1411,10 @@
 CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_CAN is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_VCAN=m
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 CONFIG_MKISS=m


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-nodebug	27 May 2008 18:17:33 -0000	1.15
+++ config-nodebug	14 Jun 2008 08:05:27 -0000	1.16
@@ -38,3 +38,5 @@
 CONFIG_DEBUG_OBJECTS_TIMERS=y
 
 CONFIG_X86_PTDUMP=y
+
+CONFIG_CAN_DEBUG_DEVICES=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -r1.692 -r1.693
--- kernel.spec	13 Jun 2008 23:54:08 -0000	1.692
+++ kernel.spec	14 Jun 2008 08:05:27 -0000	1.693
@@ -1780,6 +1780,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sat Jun 15 2008 Chuck Ebbert <cebbert at redhat.com>
+- Enable Controller Area Networking (F8#451179)
+
 * Fri Jun 13 2008 John W. Linville <linville at redhat.com>
 - Upstream wireless fixes from 2008-06-13
   (http://marc.info/?l=linux-wireless&m=121339101523260&w=2)