diff options
author | Steve French <sfrench@us.ibm.com> | 2007-07-19 04:38:57 +0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-07-19 04:38:57 +0400 |
commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /lib/lzo/Makefile | |
parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
download | linux-1ff8392c32a2645d2665ca779ecb91bb29361c13.tar.xz |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'lib/lzo/Makefile')
-rw-r--r-- | lib/lzo/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/lzo/Makefile b/lib/lzo/Makefile new file mode 100644 index 000000000000..e764116ea12d --- /dev/null +++ b/lib/lzo/Makefile @@ -0,0 +1,5 @@ +lzo_compress-objs := lzo1x_compress.o +lzo_decompress-objs := lzo1x_decompress.o + +obj-$(CONFIG_LZO_COMPRESS) += lzo_compress.o +obj-$(CONFIG_LZO_DECOMPRESS) += lzo_decompress.o |