diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2014-01-11 16:06:37 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2014-01-11 16:06:37 +0000 |
| commit | 0e2586a7748385c97062a8d8816c98011175fb3d (patch) | |
| tree | 819954dd504b84d34aba5e827e06e5b319ddc393 /target/linux/lantiq/patches-3.10 | |
| parent | 30ebad2dee1bc348c9b8234f0649a0b8f7a9cb40 (diff) | |
| download | upstream-0e2586a7748385c97062a8d8816c98011175fb3d.tar.gz upstream-0e2586a7748385c97062a8d8816c98011175fb3d.tar.bz2 upstream-0e2586a7748385c97062a8d8816c98011175fb3d.zip | |
kernel: update 3.10 to 3.10.26
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39220
Diffstat (limited to 'target/linux/lantiq/patches-3.10')
| -rw-r--r-- | target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index 3be1bebbe2..192579b0ce 100644 --- a/target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/lantiq/patches-3.10/0012-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 -@@ -925,10 +925,13 @@ static int m25p_probe(struct spi_device +@@ -926,10 +926,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 -@@ -1004,6 +1007,8 @@ static int m25p_probe(struct spi_device +@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; |