From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 14 May 2009 15:34:15 +0000 (+0000)
Subject: pcmcia patch off on 2.6.22 - see if it causes the madwifi build error
X-Git-Tag: linux-2.6-22-38~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2bc85892405272ef2b52f0c9672c6fa7045a870d;p=linux-2.6.git

pcmcia patch off on 2.6.22 - see if it causes the madwifi build error
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 76f6f9ab7..b6755ebf8 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -188,7 +188,8 @@ Patch670: linux-2.6-670-gcc43.patch
 %endif
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
-Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.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
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -401,7 +402,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