diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
| commit | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (patch) | |
| tree | b1f075ce06512879f327e1aa3abc3838b2de0539 /mk | |
| parent | 0aabef127155575e8c8d660605f9401ab15356aa (diff) | |
| parent | 87832fb8da02431280c0a1f9c127dd121ddb7b25 (diff) | |
resolve conflict
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 8a8e7f2f0..89e8d0053 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -926,13 +926,7 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ ,11)) ZLIB:=lib/zlib_deflate/zlib_deflate -ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX832),y) -ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX416),y) -ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y) ZLIB+=lib/zlib_inflate/zlib_inflate -endif -endif -endif $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ $(foreach mod, $(ZLIB),$(MODULES_DIR)/kernel/$(mod)) \ |