rpms/kernel/devel linux-2.6-wireless-fixups.patch, NONE, 1.1 kernel.spec, 1.488, 1.489

John W. Linville (linville) fedora-extras-commits at redhat.com
Tue Mar 11 00:41:34 UTC 2008


Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-wireless-fixups.patch 
Log Message:
use correct license tag for iwlcore.ko

linux-2.6-wireless-fixups.patch:

--- NEW FILE linux-2.6-wireless-fixups.patch ---
diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c
--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig	2008-03-10 20:34:32.000000000 -0400
+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c	2008-03-10 20:34:09.000000000 -0400
@@ -39,7 +39,7 @@
 MODULE_DESCRIPTION("iwl core");
 MODULE_VERSION(IWLWIFI_VERSION);
 MODULE_AUTHOR(DRV_COPYRIGHT);
-MODULE_LICENSE("GPL/BSD");
+MODULE_LICENSE("Dual BSD/GPL");
 
 #ifdef CONFIG_IWL4965_DEBUG
 u32 iwl4965_debug_level;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- kernel.spec	10 Mar 2008 20:04:14 -0000	1.488
+++ kernel.spec	11 Mar 2008 00:40:59 -0000	1.489
@@ -611,6 +611,7 @@
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
+Patch682: linux-2.6-wireless-fixups.patch
 Patch690: linux-2.6-at76.patch
 
 Patch820: linux-2.6-compile-fixes.patch
@@ -1111,6 +1112,7 @@
 #ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.26
 ApplyPatch linux-2.6-wireless-pending.patch
+ApplyPatch linux-2.6-wireless-fixups.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -1750,6 +1752,9 @@
 
 %changelog
 * Mon Mar 10 2008 John W. Linville <linville at redhat.com>
+- Use correct "Dual BSD/GPL" license tag for iwlcore.ko
+
+* Mon Mar 10 2008 John W. Linville <linville at redhat.com>
 - iwlwifi: Moving EEPROM handling in iwlcore module
 - ath5k: struct ath5k_desc cleanups
 - ath5k: move rx and tx status structures out of hardware descriptor




More information about the fedora-extras-commits mailing list