From 0e2586a7748385c97062a8d8816c98011175fb3d Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 11 Jan 2014 16:06:37 +0000 Subject: kernel: update 3.10 to 3.10.26 Signed-off-by: Gabor Juhos SVN-Revision: 39220 --- target/linux/brcm63xx/Makefile | 2 +- .../202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch | 2 +- .../203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch | 2 +- .../brcm63xx/patches-3.10/414-MTD-m25p80-allow-passing-pp_data.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/brcm63xx') diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index c4dfa25a3b..0e1e3d0ea7 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia -LINUX_VERSION:=3.10.24 +LINUX_VERSION:=3.10.26 MAINTAINER:=Florian Fainelli include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/patches-3.10/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-3.10/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch index 04b5f2f4a0..0a6b8b6d0b 100644 --- a/target/linux/brcm63xx/patches-3.10/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch +++ b/target/linux/brcm63xx/patches-3.10/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch @@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -1091,7 +1091,8 @@ static int m25p_probe(struct spi_device +@@ -1092,7 +1092,8 @@ static int m25p_probe(struct spi_device /* partitions should match sector boundaries; and it may be good to * use readonly partitions for writeprotected sectors (BP2..BP0). */ diff --git a/target/linux/brcm63xx/patches-3.10/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch b/target/linux/brcm63xx/patches-3.10/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch index 0e4ca9daa6..8e981b38c4 100644 --- a/target/linux/brcm63xx/patches-3.10/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch +++ b/target/linux/brcm63xx/patches-3.10/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch @@ -60,7 +60,7 @@ Signed-off-by: Jonas Gorski /* * Write an address range to the flash chip. Data must be written in * FLASH_PAGESIZE chunks. The address range may be any size provided -@@ -986,6 +1008,9 @@ static int m25p_probe(struct spi_device +@@ -987,6 +1009,9 @@ static int m25p_probe(struct spi_device return -ENOMEM; } diff --git a/target/linux/brcm63xx/patches-3.10/414-MTD-m25p80-allow-passing-pp_data.patch b/target/linux/brcm63xx/patches-3.10/414-MTD-m25p80-allow-passing-pp_data.patch index ca0ee6fc85..75e31f9095 100644 --- a/target/linux/brcm63xx/patches-3.10/414-MTD-m25p80-allow-passing-pp_data.patch +++ b/target/linux/brcm63xx/patches-3.10/414-MTD-m25p80-allow-passing-pp_data.patch @@ -10,7 +10,7 @@ Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -975,6 +975,9 @@ static int m25p_probe(struct spi_device +@@ -976,6 +976,9 @@ static int m25p_probe(struct spi_device dev_warn(&spi->dev, "unrecognized id %s\n", data->type); } -- cgit v1.2.3