aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-09-11 16:32:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-09-11 16:32:00 +0000
commit0b5d87fd30d3d8edd27cbcc9b7688b1f9d740b2e (patch)
tree633627a1e4d5761b609c7ff1682b69ee85b06d9f /target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch
parent2ce833060a6ac412d0df362edb950b19da9af04c (diff)
downloadupstream-0b5d87fd30d3d8edd27cbcc9b7688b1f9d740b2e.tar.gz
upstream-0b5d87fd30d3d8edd27cbcc9b7688b1f9d740b2e.tar.bz2
upstream-0b5d87fd30d3d8edd27cbcc9b7688b1f9d740b2e.zip
brcm2708: update 4.1 patches
As usual, this patches were taken (and rebased) from https://github.com/raspberrypi/linux/commits/rpi-4.1.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> SVN-Revision: 46853
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.patch27
1 files changed, 27 insertions, 0 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
new file mode 100644
index 0000000000..101f28e404
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch
@@ -0,0 +1,27 @@
+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
+@@ -592,7 +592,6 @@ static int bcm2835_spi_transfer_one(stru
+ return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs);
+ }
+
+-#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
+ /* and reset */
+ bcm2835_spi_reset_hw(master);
+ }
+-#endif
+
+ static void bcm2835_spi_set_cs(struct spi_device *spi, bool gpio_level)
+ {