mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-28 04:34:39 +02:00
f21c103e5a
Also remove a duplicate patch from lantiq (already in generic). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 63e9d017ce90dc1cd0822bace72e4e391feafdab Mon Sep 17 00:00:00 2001
|
|
From: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
|
|
Date: Fri, 17 Feb 2012 22:32:18 +0100
|
|
Subject: [PATCH 03/70] MTD: MIPS: lantiq: reintroduce support for cmdline
|
|
partitions
|
|
|
|
Since commit ca97dec2ab5c87e9fbdf7e882e1820004a3966fa the
|
|
command line parsing of MTD partitions does not work anymore.
|
|
|
|
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
drivers/mtd/maps/lantiq-flash.c | 3 ++-
|
|
1 files changed, 2 insertions(+), 1 deletions(-)
|
|
|
|
--- a/drivers/mtd/maps/lantiq-flash.c
|
|
+++ b/drivers/mtd/maps/lantiq-flash.c
|
|
@@ -45,6 +45,7 @@ struct ltq_mtd {
|
|
};
|
|
|
|
static char ltq_map_name[] = "ltq_nor";
|
|
+static const char *ltq_probe_types[] __devinitconst = { "cmdlinepart", NULL };
|
|
|
|
static map_word
|
|
ltq_read16(struct map_info *map, unsigned long adr)
|
|
@@ -168,7 +169,7 @@ ltq_mtd_probe(struct platform_device *pd
|
|
cfi->addr_unlock1 ^= 1;
|
|
cfi->addr_unlock2 ^= 1;
|
|
|
|
- err = mtd_device_parse_register(ltq_mtd->mtd, NULL, 0,
|
|
+ err = mtd_device_parse_register(ltq_mtd->mtd, ltq_probe_types, 0,
|
|
ltq_mtd_data->parts, ltq_mtd_data->nr_parts);
|
|
if (err) {
|
|
dev_err(&pdev->dev, "failed to add partitions\n");
|