0cd478518f
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
27 lines
744 B
Diff
27 lines
744 B
Diff
From e418efa578dab433bf7e25eaaec809b33351792c Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Tue, 18 Aug 2015 11:50:03 +0100
|
|
Subject: [PATCH 163/171] spi: bcm2835: Fix buld error from previous commit
|
|
|
|
---
|
|
drivers/spi/spi-bcm2835.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
--- a/drivers/spi/spi-bcm2835.c
|
|
+++ b/drivers/spi/spi-bcm2835.c
|
|
@@ -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)
|
|
{
|
|
@@ -624,7 +623,6 @@ static void bcm2835_spi_handle_err(struc
|
|
/* and reset */
|
|
bcm2835_spi_reset_hw(master);
|
|
}
|
|
-#endif
|
|
|
|
static void bcm2835_spi_set_cs(struct spi_device *spi, bool gpio_level)
|
|
{
|