summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-11 19:28:36 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-11 19:28:36 -0800
commit4af75653031c6d454b4ace47c1536f0d2e727e3e (patch)
treebdc30ef96ccebc9681abdc269d4364526588ec73
parent7d44e8921851f460bcacb3ade432a4f5ada20fb6 (diff)
downloadlinux-4af75653031c6d454b4ace47c1536f0d2e727e3e.tar.gz
linux-4af75653031c6d454b4ace47c1536f0d2e727e3e.tar.bz2
linux-4af75653031c6d454b4ace47c1536f0d2e727e3e.zip
Revert "make bnx2x select ZLIB_INFLATE"
This reverts commit 70eba18b5664f90d7620905e005b89388e5fd94b, as per Jeff Garzik: "That was meant for 2.6.25, and actually (due to patching) applied to a completely unrelated 2.6.24 net driver." Noted-by: Roland Dreier <rdreier@cisco.com> Requested-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/net/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6cde4edc846b..d9107e542dfa 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2588,7 +2588,6 @@ config MLX4_DEBUG
config TEHUTI
tristate "Tehuti Networks 10G Ethernet"
depends on PCI
- select ZLIB_INFLATE
help
Tehuti Networks 10G Ethernet NIC