diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /mk/modules.mk | |
parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) |
fix conflict
Diffstat (limited to 'mk/modules.mk')
-rw-r--r-- | mk/modules.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index c429f114e..c9819c697 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -940,8 +940,6 @@ $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ ,10)) $(eval $(call KMOD_template,CRYPTO_LZO,crypto-lzo,\ - $(MODULES_DIR)/kernel/lib/lzo/lzo_compress \ - $(MODULES_DIR)/kernel/lib/lzo/lzo_decompress \ $(MODULES_DIR)/kernel/crypto/lzo \ ,10)) |