diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-15 16:00:41 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-15 16:00:41 +0000 |
| commit | bd758645eb70c1b9d3f52878eaaf2f901342e7fd (patch) | |
| tree | d4d295fb2cbe10aa39502d39d7094bc7149e2990 /target/linux/ramips/patches-3.10 | |
| parent | 0f116fdd09b19d53b243c1232b8507ae35398f4f (diff) | |
kernel: update 3.10 to 3.10.12
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38000 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.10')
| -rw-r--r-- | target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 | ||||
| -rw-r--r-- | target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch | 2 |
2 files changed, 3 insertions, 3 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 6826463266..e9c992e2a1 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; diff --git a/target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch b/target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch index f7da13a6d8..4d1a4ce6fb 100644 --- a/target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch +++ b/target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -807,10 +807,6 @@ static void split_uimage(struct mtd_info +@@ -808,10 +808,6 @@ static void split_uimage(struct mtd_info return; len = be32_to_cpu(hdr.size) + 0x40; |