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
29 lines
867 B
Diff
29 lines
867 B
Diff
From c36a53b3df68f0311b808f87c186b9623a28ecd9 Mon Sep 17 00:00:00 2001
|
|
From: Martin Sperl <kernel@martin.sperl.org>
|
|
Date: Wed, 22 Jul 2015 07:43:28 +0000
|
|
Subject: [PATCH 159/171] spi: bcm2835: fixed compile issues due to embedded
|
|
comments... replaced with #if to avoid issues in the future.
|
|
|
|
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
|
---
|
|
drivers/spi/spi-bcm2835.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/drivers/spi/spi-bcm2835.c
|
|
+++ b/drivers/spi/spi-bcm2835.c
|
|
@@ -609,6 +609,7 @@ 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)
|
|
{
|
|
@@ -623,6 +624,7 @@ 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)
|
|
{
|