aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-12-03 18:13:18 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-12-03 18:13:18 +0000
commitb6c404e141ef7bc36362b466eda678c784659142 (patch)
treed36ca0c893d18b0359f813fd726a4c5a46e5a6af /target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch
parentc7c70fbb89f0f14a69c168d9919458afa34f734d (diff)
downloadmaster-187ad058-b6c404e141ef7bc36362b466eda678c784659142.tar.gz
master-187ad058-b6c404e141ef7bc36362b466eda678c784659142.tar.bz2
master-187ad058-b6c404e141ef7bc36362b466eda678c784659142.zip
ar71xx: allow to pass part_probe types to the m25p80 driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29411 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch')
-rw-r--r--target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch
index 149474bcc1..35c5a07a09 100644
--- a/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch
@@ -1,8 +1,8 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -968,6 +968,16 @@ static int __devinit m25p_probe(struct s
- part_probes, &parts, 0);
- }
+@@ -972,6 +972,16 @@ static int __devinit m25p_probe(struct s
+ nr_parts = parse_mtd_partitions(&flash->mtd,
+ data->part_probes, &parts, 0);
+#ifdef CONFIG_MTD_MYLOADER_PARTS
+ if (nr_parts <= 0) {