diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
commit | 8d69af7c9fff947e2e53ba955cf6c84df3f1391e (patch) | |
tree | 192a79439e8d6b82dd39af6ac6f019c472cdc1c3 /target/linux/brcm63xx/patches-3.6/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch | |
parent | 6a699a8ae80b5b6ff6559bad1297242c8daf8934 (diff) | |
download | upstream-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.tar.gz upstream-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.tar.bz2 upstream-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.zip |
add preliminary support for 3.6 kernel
SVN-Revision: 33936
Diffstat (limited to 'target/linux/brcm63xx/patches-3.6/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.6/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.6/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-3.6/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch new file mode 100644 index 0000000000..d616ac2721 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.6/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch @@ -0,0 +1,23 @@ +From c7c3c338cb25d7f55ddb3f6bfbf3572758ca3896 Mon Sep 17 00:00:00 2001 +From: Jonas Gorski <jonas.gorski@gmail.com> +Date: Thu, 10 Nov 2011 16:53:08 +0100 +Subject: [PATCH 50/79] MTD: DEVICES: m25p80: use parsers if provided in flash + platform data + +Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> +--- + drivers/mtd/devices/m25p80.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/mtd/devices/m25p80.c ++++ b/drivers/mtd/devices/m25p80.c +@@ -960,7 +960,8 @@ static int __devinit m25p_probe(struct s + /* partitions should match sector boundaries; and it may be good to + * use readonly partitions for writeprotected sectors (BP2..BP0). + */ +- return mtd_device_parse_register(&flash->mtd, NULL, &ppdata, ++ return mtd_device_parse_register(&flash->mtd, ++ data ? data->part_probe_types : NULL, &ppdata, + data ? data->parts : NULL, + data ? data->nr_parts : 0); + } |