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
Add web100 patch.
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
6e8c275
..
3cdd14a
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-185,6
+185,7
@@
Patch660: linux-2.6-660-nmi-watchdog-default.patch
Patch670: linux-2.6-670-gcc43.patch
%endif
Patch680: linux-2.6-680-htb-hysteresis-tso.patch
Patch670: linux-2.6-670-gcc43.patch
%endif
Patch680: linux-2.6-680-htb-hysteresis-tso.patch
+Patch690: linux-2.6-690-web100.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
@@
-395,6
+396,7
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 670
%endif
%ApplyPatch 680
%ApplyPatch 670
%endif
%ApplyPatch 680
+%ApplyPatch 690
# 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