diff options
Diffstat (limited to 'target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index 927e5e910b..f1ba885df3 100644 --- a/target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -12,11 +12,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 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 5b6b072..3a7a8f7 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -904,10 +904,13 @@ static int m25p_probe(struct spi_device *spi) +@@ -922,10 +922,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 5b6b072..3a7a8f7 100644 #endif /* Platform data helps sort out which chip type we have, as -@@ -983,6 +986,8 @@ static int m25p_probe(struct spi_device *spi) +@@ -1001,6 +1004,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; @@ -39,6 +37,3 @@ index 5b6b072..3a7a8f7 100644 else flash->mtd.name = dev_name(&spi->dev); --- -1.7.10.4 - |