Tagging module linux-2.6 - linux-2.6-22-38

[linux-2.6.git] / kernel-2.6.spec

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index b6755eb..7ffd848 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -24,7 +24,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # for module-tag.py - sublevel is used for the version (middle) part of tag names
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 37
+%define taglevel 38
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -188,8 +188,7 @@ Patch670: linux-2.6-670-gcc43.patch
 %endif
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
-# this patch causes mysterious errors when building madwifi on this 2.6.22 kernel..
-#Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
+Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -402,7 +401,7 @@ KERNEL_PREVIOUS=vanilla
 %endif
 %ApplyPatch 680
 %ApplyPatch 690
-#%ApplyPatch 710
+%ApplyPatch 710
 
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
@@ -865,6 +864,9 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Fri May 15 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-38
+- the pcmcia patch needed to be adapted to 2.6.22
+
 * Tue May 12 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-37
 - enable patch about 64bits adresses and cardbus