Resolve patch conflicts after rebase to 2.6.22 mainline

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

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 4a3c980..bc8eea6 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -160,7 +160,6 @@ Patch010: linux-2.6-010-e1000e.patch
 Patch015: linux-2.6-015-igb.patch
 Patch017: linux-2.6-017-bnx2.patch
 Patch020: linux-2.6-020-build-id.patch
-Patch021: linux-2.6-021-bcm.patch
 Patch030: linux-2.6-030-netns.patch
 Patch040: linux-2.6-040-i_mutex-check.patch
 Patch050: linux-2.6-050-getline.patch
@@ -402,7 +401,6 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 15
 %ApplyPatch 17
 %ApplyPatch 20
-%ApplyPatch 21
 
 # NetNS patch for VINI
 %if 0%{?with_netns}