rpms/kernel/F-9 config-debug, 1.10, 1.11 config-generic, 1.102, 1.103 config-nodebug, 1.12, 1.13 kernel.spec, 1.679, 1.680

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30039

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



Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-debug,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-debug	27 Mar 2008 20:25:45 -0000	1.10
+++ config-debug	14 Jun 2008 07:59:23 -0000	1.11
@@ -32,3 +32,5 @@
 # CONFIG_DEBUG_PAGEALLOC is not set
 
 CONFIG_USB_DEBUG=y
+
+CONFIG_CAN_DEBUG_DEVICES=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- config-generic	20 May 2008 08:19:52 -0000	1.102
+++ config-generic	14 Jun 2008 07:59:23 -0000	1.103
@@ -1399,7 +1399,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/F-9/config-nodebug,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-nodebug	8 Apr 2008 02:46:08 -0000	1.12
+++ config-nodebug	14 Jun 2008 07:59:23 -0000	1.13
@@ -31,3 +31,5 @@
 # CONFIG_DEBUG_PAGEALLOC is not set
 
 # CONFIG_USB_DEBUG is not set
+
+# CONFIG_CAN_DEBUG_DEVICES is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.679
retrieving revision 1.680
diff -u -r1.679 -r1.680
--- kernel.spec	14 Jun 2008 00:09:51 -0000	1.679
+++ kernel.spec	14 Jun 2008 07:59:23 -0000	1.680
@@ -1849,6 +1849,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> 2.6.25.6-61
+- Enable Controller Area Networking (F8#451179)
+
 * Fri Jun 13 2008 John W. Linville <linville at redhat.com> 2.6.25.6-60
 - Upstream wireless fixes from 2008-06-13
   (http://marc.info/?l=linux-wireless&m=121339101523260&w=2)