diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 00:26:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 00:26:34 -0700 |
| commit | cbd09dbbb62096c1da627eca865f988d2ed0a84e (patch) | |
| tree | 9601e631cee6651c638cc7b4d2d9b7cf20b6b485 /lib/zlib_inflate/Makefile | |
| parent | d81fec0f97cce4aea36a89340af247523c1263a0 (diff) | |
| parent | d4faaecbcc6d9ea4f7c05f6de6af98e2336a4afb (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[ZLIB]: Fix external builds of zlib_inflate code.
[TG3]: Fix APE induced regression
[SKY2]: version 1.19
[SKY2]: use netdevice stats struct
[SKY2]: fiber advertise bits initialization (trivial)
[SKY2]: fix power settings on Yukon XL
[SKY2]: ethtool register reserved area blackout
Diffstat (limited to 'lib/zlib_inflate/Makefile')
| -rw-r--r-- | lib/zlib_inflate/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/zlib_inflate/Makefile b/lib/zlib_inflate/Makefile index bf065482fa6..49f8ce5774d 100644 --- a/lib/zlib_inflate/Makefile +++ b/lib/zlib_inflate/Makefile @@ -15,5 +15,5 @@ obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate.o -zlib_inflate-objs := inffast.o inflate.o \ +zlib_inflate-objs := inffast.o inflate.o infutil.o \ inftrees.o inflate_syms.o |