git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put patch back in - was using wrong kernel version - stupid me
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
b6755eb
..
76f6f9a
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-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
%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
# 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
%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
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may