aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.14
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-03-11 15:55:55 +0000
committerJohn Crispin <john@openwrt.org>2015-03-11 15:55:55 +0000
commit9f16b370a0506f01aa5ec40190e995f371d9027a (patch)
treedd207ac3508ca6af2092d04c47f1b7f3489a964a /target/linux/ar71xx/patches-3.14
parent0496393f9c7f83f5984b01a50184e2f9afb8c578 (diff)
downloadupstream-9f16b370a0506f01aa5ec40190e995f371d9027a.tar.gz
upstream-9f16b370a0506f01aa5ec40190e995f371d9027a.tar.bz2
upstream-9f16b370a0506f01aa5ec40190e995f371d9027a.zip
ar71xx: fix WRT160NL and TP-Link partition parser patches
405-mtd-tp-link-partition-parser.patch was updating the WRT160NL's partition parser Kconfig. This patch moves the relevant change into the right file: 404-mtd-wrt160nl-trx-parser.patch Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> SVN-Revision: 44662
Diffstat (limited to 'target/linux/ar71xx/patches-3.14')
-rw-r--r--target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch2
-rw-r--r--target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch9
2 files changed, 1 insertions, 10 deletions
diff --git a/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch
index e49d72eb4f..b5f4b529af 100644
--- a/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch
@@ -6,7 +6,7 @@
+config MTD_WRT160NL_PARTS
+ tristate "Linksys WRT160NL partitioning support"
-+ depends on MTD_PARTITIONS && ATH79_MACH_WRT160NL
++ depends on ATH79_MACH_WRT160NL
+ ---help---
+ Linksys WRT160NL partitioning support
+
diff --git a/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch b/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
index 0688bb896e..74e79ea770 100644
--- a/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
+++ b/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
@@ -1,14 +1,5 @@
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
-@@ -186,7 +186,7 @@ config MTD_BCM47XX_PARTS
-
- config MTD_WRT160NL_PARTS
- tristate "Linksys WRT160NL partitioning support"
-- depends on MTD_PARTITIONS && ATH79_MACH_WRT160NL
-+ depends on ATH79_MACH_WRT160NL
- ---help---
- Linksys WRT160NL partitioning support
-
@@ -206,6 +206,12 @@ config MTD_MYLOADER_PARTS
You will still need the parsing functions to be called by the driver
for your particular device. It won't happen automatically.