diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-04 11:34:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-04 11:34:39 +0000 |
| commit | 0cd478518fd2333cb6a33e134b4e15eb4efd5eb3 (patch) | |
| tree | d0a1a756d8b4469d550ffbd17f0c7dd8300ecb82 /target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch | |
| parent | dea417017edc6717e2662ab97b0af3d0b724d360 (diff) | |
| download | upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.gz upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.bz2 upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.zip | |
kernel: update 4.1 to 4.1.10
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa).
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10
096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied
upstream and dropped.
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
[update from 4.1.9 to 4.1.10]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47104
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch b/target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch index 101f28e404..21061de5ca 100644 --- a/target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch +++ b/target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch @@ -9,15 +9,15 @@ Subject: [PATCH 163/171] spi: bcm2835: Fix buld error from previous commit --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c -@@ -592,7 +592,6 @@ static int bcm2835_spi_transfer_one(stru - return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs); +@@ -609,7 +609,6 @@ static int bcm2835_spi_prepare_message(s + return 0; } -#if 0 static void bcm2835_spi_handle_err(struct spi_master *master, struct spi_message *msg) { -@@ -607,7 +606,6 @@ static void bcm2835_spi_handle_err(struc +@@ -624,7 +623,6 @@ static void bcm2835_spi_handle_err(struc /* and reset */ bcm2835_spi_reset_hw(master); } |