diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-26 15:15:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-26 15:15:43 +0100 |
| commit | f8f4789eb00ad9e7768a98bed5f598f36c6679f4 (patch) | |
| tree | 23e1e1aaa58b147f21e3ee19a25886edf7960cb9 /mk | |
| parent | ad9e0b66c9f717f3cdcc4a265fd2a41a37b8ed1b (diff) | |
| parent | 6967ec40538c8b4f8646dfc38aa355dc70a84dab (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/modules.mk | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index 751aa2ae4..6ac3a77f5 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -10,6 +10,8 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_BUSYBOX_HIDE=n \ ADK_DISABLE_KERNEL_PATCHES=n \ ADK_DISABLE_TARGET_KERNEL_PATCHES=n \ + ADK_DISABLE_TCP_FASTOPEN=n \ + ADK_KERNEL_FB_CON_DECOR=n \ ADK_CHOOSE_APPLIANCE=n \ ADK_WGET_TIMEOUT=180 \ ADK_MAKE_PARALLEL=y \ diff --git a/mk/modules.mk b/mk/modules.mk index 598c46392..84d5beb10 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -591,11 +591,6 @@ $(eval $(call KMOD_template,IP_NF_TARGET_REJECT,ip-nf-target-reject,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REJECT \ ,60)) - -$(eval $(call KMOD_template,IP_NF_TARGET_ULOG,ip-nf-target-ulog,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ULOG \ -,60)) - $(eval $(call KMOD_template,IP_NF_TARGET_TCPMSS,ip-nf-target-tcpmss,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_TCPMSS \ ,60)) |