summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/linux/config/Config.in.addons4
-rw-r--r--target/linux/config/Config.in.network2
-rw-r--r--target/linux/patches/3.14.35/fblogo.patch (renamed from target/linux/patches/3.14.35/patch.fblogo)0
-rw-r--r--target/linux/patches/3.14.35/mptcp.patch (renamed from target/linux/patches/3.14.35/patch-mptcp)0
4 files changed, 1 insertions, 5 deletions
diff --git a/target/linux/config/Config.in.addons b/target/linux/config/Config.in.addons
index 9eee7598d..c0a8b57ba 100644
--- a/target/linux/config/Config.in.addons
+++ b/target/linux/config/Config.in.addons
@@ -8,7 +8,3 @@ config ADK_KERNEL_ADDON_YAFFS2
config ADK_KERNEL_ADDON_GRSEC
bool
depends on ADK_KERNEL_VERSION_3_14
-
-config ADK_KERNEL_ADDON_MPTCP
- bool
- depends on ADK_KERNEL_VERSION_3_14
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 16c380929..c83372c02 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -226,7 +226,7 @@ config ADK_KERNEL_BONDING
config ADK_KERNEL_MPTCP
bool "Multipath TCP support"
select ADK_KERNEL_IPV6
- select ADK_KERNEL_ADDON_MPTCP
+ depends on ADK_KERNEL_VERSION_3_14
help
http://www.multipath-tcp.org
diff --git a/target/linux/patches/3.14.35/patch.fblogo b/target/linux/patches/3.14.35/fblogo.patch
index cbbb4216f..cbbb4216f 100644
--- a/target/linux/patches/3.14.35/patch.fblogo
+++ b/target/linux/patches/3.14.35/fblogo.patch
diff --git a/target/linux/patches/3.14.35/patch-mptcp b/target/linux/patches/3.14.35/mptcp.patch
index 9784e0577..9784e0577 100644
--- a/target/linux/patches/3.14.35/patch-mptcp
+++ b/target/linux/patches/3.14.35/mptcp.patch