SPECS (LINUX_2_6): kernel.spec - merged from LINUX_2_6_22

[blues]

Author: blues                        Date: Mon Oct 29 11:57:24 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- merged from LINUX_2_6_22

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1802 -> 1.441.2.1803) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1802 SPECS/kernel.spec:1.441.2.1803
--- SPECS/kernel.spec:1.441.2.1802	Sat Oct 27 20:55:26 2007
+++ SPECS/kernel.spec	Mon Oct 29 12:57:18 2007
@@ -348,6 +348,7 @@
 
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	linux-2.6.21.1-pwc-uncompress.patch
+Patch2002:	kernel-ieee80211_rate.patch
 
 # kill some thousands of warnings
 Patch2500:	linux-2.6-warnings.patch
@@ -972,6 +973,7 @@
 # Small fixes:
 %patch2000 -p1
 %patch2001 -p1
+%patch2002 -p1
 
 %if %{with abi}
 patch -p1 -s < kernel-patch-linuxabi-20060404/linuxabi-2.6.17-0.patch
@@ -1357,7 +1359,7 @@
 install %{SOURCE4} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
 
 # Temporary fix for iwlwifi:
-cp $RPM_BUILD_ROOT%{_kernelsrcdir}/net/mac80211/ieee80211_rate.h \
+cp $RPM_BUILD_ROOT%{_kernelsrcdir}/net/mac80211/{ieee80211_{rate,i},sta_info}.h \
 	$RPM_BUILD_ROOT%{_kernelsrcdir}/include/net
 
 # collect module-build files and directories
@@ -1667,6 +1669,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1803  2007/10/29 11:57:18  blues
+- merged from LINUX_2_6_22
+
 Revision 1.441.2.1802  2007/10/27 18:55:26  blues
 - ieee80211_rate.h is required by iwlwifi - copy it to headers
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1802&r2=1.441.2.1803&f=u