aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-03-11 15:55:55 +0000
committerJohn Crispin <blogic@openwrt.org>2015-03-11 15:55:55 +0000
commitd93222ddefac21f47b62619465ea521f9097beaa (patch)
treee17dfac7cf6d63f301fbb7317387d418f38fd54a
parentdb982be738eeffa0df6cd557db88379529ebeceb (diff)
downloadupstream-d93222ddefac21f47b62619465ea521f9097beaa.tar.gz
upstream-d93222ddefac21f47b62619465ea521f9097beaa.tar.bz2
upstream-d93222ddefac21f47b62619465ea521f9097beaa.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44662 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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
-rw-r--r--target/linux/ar71xx/patches-3.18/404-mtd-wrt160nl-trx-parser.patch2
-rw-r--r--target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch9
4 files changed, 2 insertions, 20 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.
diff --git a/target/linux/ar71xx/patches-3.18/404-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-3.18/404-mtd-wrt160nl-trx-parser.patch
index e49d72eb4f..b5f4b529af 100644
--- a/target/linux/ar71xx/patches-3.18/404-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-3.18/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.18/405-mtd-tp-link-partition-parser.patch b/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch
index 0688bb896e..74e79ea770 100644
--- a/target/linux/ar71xx/patches-3.18/405-mtd-tp-link-partition-parser.patch
+++ b/target/linux/ar71xx/patches-3.18/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.