X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=87865ed73b647d7922087c069efb778bb7888064;hb=339f53ab0affdf1a51016ea6fff63f126fc98817;hp=fdc1ecc8f307aed2771b09bbf53f0821cd46524d;hpb=d9b0d8911c14fb538d827d2078316a8dd656a853;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index fdc1ecc8f..87865ed73 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -34,7 +34,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # for module-tag.py - sublevel is used for the version (middle) part of tag names
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 48
+%define taglevel 49
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -61,11 +61,11 @@ Summary: The Linux kernel (the core of the Linux operating system)
 %define signmodules 0
 %define make_target bzImage
 
-%if "%{distro}" == "Fedora" && %{distrorelease} >= 13
-%define KVERREL %{version}-%{kernelrelease}
-%else
+#%if "%{distro}" == "Fedora" && %{distrorelease} >= 13
+#%define KVERREL %{version}-%{kernelrelease}
+#%else
 %define KVERREL %{PACKAGE_VERSION}-%{kernelrelease}
-%endif
+#%endif
 
 # Override generic defaults with per-arch defaults
 
@@ -162,8 +162,7 @@ Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
 
 Patch010: linux-2.6-010-e1000e.patch
 Patch015: linux-2.6-015-igb.patch
-# disabled
-#Patch016: linux-2.6-016-bnx2x.patch
+Patch017: linux-2.6-017-bnx2.patch
 Patch020: linux-2.6-020-build-id.patch
 Patch030: linux-2.6-030-netns.patch
 Patch040: linux-2.6-040-i_mutex-check.patch
@@ -405,9 +404,7 @@ KERNEL_PREVIOUS=vanilla
 
 %ApplyPatch 10
 %ApplyPatch 15
-%if 0
-%ApplyPatch 16
-%endif
+%ApplyPatch 17
 %ApplyPatch 20
 
 # NetNS patch for VINI