diff options
| author | John Crispin <john@openwrt.org> | 2014-06-19 14:12:59 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-06-19 14:12:59 +0000 |
| commit | 6c46a10246f98dfebc2ab0df631f8129ffee2b2e (patch) | |
| tree | a6d545b7d109d618bec251a69e2358d7e21c2f26 /target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | |
| parent | 4b1c48bc9309c8ee9309e17ed42241ea7a1a64e6 (diff) | |
| download | upstream-6c46a10246f98dfebc2ab0df631f8129ffee2b2e.tar.gz upstream-6c46a10246f98dfebc2ab0df631f8129ffee2b2e.tar.bz2 upstream-6c46a10246f98dfebc2ab0df631f8129ffee2b2e.zip | |
lantiq: refresh patches
this adds ben's ath9k fixup
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 41269
Diffstat (limited to 'target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch')
| -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 192579b0ce..17eef08eb7 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 -@@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device +@@ -927,10 +927,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 -@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device +@@ -1006,6 +1009,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; |