diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-08-23 17:31:04 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-08-23 17:31:04 +0000 |
commit | 1b2ea64f5ab6aa812469a4917d7e0b849e5e3f7d (patch) | |
tree | 411e0252ffed6d9792ea2852897e688c0a1ac1eb /target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | |
parent | e92011ca0082948a7fe22e3760ba4593ee53f47b (diff) | |
download | upstream-1b2ea64f5ab6aa812469a4917d7e0b849e5e3f7d.tar.gz upstream-1b2ea64f5ab6aa812469a4917d7e0b849e5e3f7d.tar.bz2 upstream-1b2ea64f5ab6aa812469a4917d7e0b849e5e3f7d.zip |
kernel: update 3.10 to 3.10.9
Also refresh 3.10 patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37832 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 b48023dd29..6826463266 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 -@@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device +@@ -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; @@ -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 +@@ -1001,6 +1004,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; |