kernel: update 4.1 to 4.1.10

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.1 / 0159-spi-bcm2835-fixed-compile-issues-due-to-embedded-com.patch

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
index 6f5cee2aa5428243a9943d715fa923e408c54d2d..394112284c2c0ca970018a6c83bcc55116e8f050 100644 (file)
--- 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
@@ -11,15 +11,15 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
 
 --- 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);
+@@ -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)
  {
-@@ -606,6 +607,7 @@ static void bcm2835_spi_handle_err(struc
+@@ -623,6 +624,7 @@ static void bcm2835_spi_handle_err(struc
        /* and reset */
        bcm2835_spi_reset_hw(master);
  }