diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-09-11 16:32:00 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-11 16:32:00 +0000 |
| commit | 0b5d87fd30d3d8edd27cbcc9b7688b1f9d740b2e (patch) | |
| tree | 633627a1e4d5761b609c7ff1682b69ee85b06d9f /target/linux/brcm2708/patches-4.1/0159-spi-bcm2835-fixed-compile-issues-due-to-embedded-com.patch | |
| parent | 2ce833060a6ac412d0df362edb950b19da9af04c (diff) | |
| download | upstream-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/0159-spi-bcm2835-fixed-compile-issues-due-to-embedded-com.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.1/0159-spi-bcm2835-fixed-compile-issues-due-to-embedded-com.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0159-spi-bcm2835-fixed-compile-issues-due-to-embedded-com.patch b/target/linux/brcm2708/patches-4.1/0159-spi-bcm2835-fixed-compile-issues-due-to-embedded-com.patch new file mode 100644 index 0000000000..6f5cee2aa5 --- /dev/null +++ b/target/linux/brcm2708/patches-4.1/0159-spi-bcm2835-fixed-compile-issues-due-to-embedded-com.patch @@ -0,0 +1,29 @@ +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 +@@ -592,6 +592,7 @@ 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) + { +@@ -606,6 +607,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) + { |