From d93222ddefac21f47b62619465ea521f9097beaa Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 11 Mar 2015 15:55:55 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44662 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.14/404-mtd-wrt160nl-trx-parser.patch | 2 +- .../patches-3.14/405-mtd-tp-link-partition-parser.patch | 9 --------- .../patches-3.18/404-mtd-wrt160nl-trx-parser.patch | 2 +- .../patches-3.18/405-mtd-tp-link-partition-parser.patch | 9 --------- 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.