aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-02-25 17:26:25 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-02-25 17:26:25 +0000
commitb84d1996ba593d8e54c9ca18c7cc593227917757 (patch)
tree5198f310a5fc235f28b99c6b2948b4c6a19895f3 /target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch
parenta3989e3dbd80248789ee379538e6de22c1d47d0e (diff)
downloadupstream-b84d1996ba593d8e54c9ca18c7cc593227917757.tar.gz
upstream-b84d1996ba593d8e54c9ca18c7cc593227917757.tar.bz2
upstream-b84d1996ba593d8e54c9ca18c7cc593227917757.zip
upgrade to 2.6.37.1
SVN-Revision: 25706
Diffstat (limited to 'target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch')
-rw-r--r--target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch b/target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch
index 887dab0b7d..2c085e1ce2 100644
--- a/target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch
+++ b/target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
-@@ -170,6 +170,13 @@ static int physmap_flash_probe(struct pl
+@@ -173,6 +173,13 @@ static int physmap_flash_probe(struct pl
goto err_out;
#ifdef CONFIG_MTD_PARTITIONS
@@ -14,7 +14,7 @@
err = parse_mtd_partitions(info->cmtd, part_probe_types,
&info->parts, 0);
if (err > 0) {
-@@ -177,13 +184,6 @@ static int physmap_flash_probe(struct pl
+@@ -180,13 +187,6 @@ static int physmap_flash_probe(struct pl
info->nr_parts = err;
return 0;
}