rpms/kernel/devel config-generic,1.12,1.13 kernel.spec,1.52,1.53

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	config-generic kernel.spec 
Log Message:
* Fri Aug 03 2007 Dave Jones <davej at redhat.com>
- Reenable CONFIG_NETLABEL.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-generic	2 Aug 2007 23:37:31 -0000	1.12
+++ config-generic	3 Aug 2007 23:26:30 -0000	1.13
@@ -924,8 +924,7 @@
 # CONFIG_TIPC_ADVANCED is not set
 # CONFIG_TIPC_DEBUG is not set
 
-# FIXME: Disabled for now, on JamesM's request. (busted in 2.6.22git1)
-# CONFIG_NETLABEL is not set
+CONFIG_NETLABEL=y
 
 #
 # QoS and/or fair queueing


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kernel.spec	3 Aug 2007 14:37:00 -0000	1.52
+++ kernel.spec	3 Aug 2007 23:26:30 -0000	1.53
@@ -2143,6 +2143,9 @@
 
 %changelog
 * Fri Aug 03 2007 Dave Jones <davej at redhat.com>
+- Reenable CONFIG_NETLABEL.
+
+* Fri Aug 03 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc1-git13
 
 * Fri Aug 03 2007 John W. Linville <linville at redhat.com>