diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-15 16:00:41 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-15 16:00:41 +0000 |
| commit | 554772a66547afa10bc7fc3040f3bf9259728c60 (patch) | |
| tree | 0e13685d463ed4e6c63782bdfa6a4258ba154c99 /target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | |
| parent | 57c6730ed623e347ed8eae420e5e2fa6e67ebecc (diff) | |
| download | mtk-20170518-554772a66547afa10bc7fc3040f3bf9259728c60.zip mtk-20170518-554772a66547afa10bc7fc3040f3bf9259728c60.tar.gz mtk-20170518-554772a66547afa10bc7fc3040f3bf9259728c60.tar.bz2 | |
kernel: update 3.10 to 3.10.12
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38000
Diffstat (limited to 'target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index 6826463..e9c992e 100644 --- a/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -922,10 +922,13 @@ static int m25p_probe(struct spi_device +@@ -925,10 +925,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; @@ -28,7 +28,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> #endif /* Platform data helps sort out which chip type we have, as -@@ -1001,6 +1004,8 @@ static int m25p_probe(struct spi_device +@@ -1004,6 +1007,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; |