X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fpatches-3.8%2F0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch;h=6df2beb1cad2a7190a40ac0d9419ea939579465c;hb=e863b8086efa1eae7d9224091746803150cea9a2;hp=42cf8339b594b566bf28ab3d0321815b8b0ffe9d;hpb=9d15912357a1e78fa578780782752d6159d53b90;p=openwrt.git diff --git a/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index 42cf8339b5..6df2beb1ca 100644 --- a/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -12,11 +12,9 @@ Signed-off-by: John Crispin drivers/mtd/devices/m25p80.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c -index 4eeeb2d..b12da33 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -810,10 +810,13 @@ static int m25p_probe(struct spi_device *spi) +@@ -828,10 +828,13 @@ static int m25p_probe(struct spi_device unsigned i; struct mtd_part_parser_data ppdata; struct device_node __maybe_unused *np = spi->dev.of_node; @@ -30,7 +28,7 @@ index 4eeeb2d..b12da33 100644 #endif /* Platform data helps sort out which chip type we have, as -@@ -889,6 +892,8 @@ static int m25p_probe(struct spi_device *spi) +@@ -907,6 +910,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; @@ -39,6 +37,3 @@ index 4eeeb2d..b12da33 100644 else flash->mtd.name = dev_name(&spi->dev); --- -1.7.10.4 -