From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Wed, 21 Jan 2009 22:08:04 +0000 (+0000)
Subject: Resolved conflict with kernel version string.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=35f4f8ba16dd37be1f319a9079ad338b2f6d1d0b;p=linux-2.6.git

Resolved conflict with kernel version string.
Back out DRL patch.
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 97584c9f5..3244be638 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -205,7 +205,6 @@ Patch660: linux-2.6-660-nmi-watchdog-default.patch
 %if "%{distroname}" == "f9" || "%{distroname}" == "f10"
 Patch670: linux-2.6-670-gcc43.patch
 %endif
-Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
 Patch700: linux-2.6-700-fperm.patch
 Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
@@ -450,7 +449,6 @@ KERNEL_PREVIOUS=vanilla
 %if "%{distroname}" == "f9" || "%{distroname}" == "f10"
 %ApplyPatch 670
 %endif
-%ApplyPatch 680
 %ApplyPatch 690
 %ApplyPatch 700
 %ApplyPatch 710