kernel: update 4.1 to 4.1.10

[openwrt/svn-archive/archive.git] / target / linux / brcm2708 / patches-4.1 / 0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch

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
index 101f28e4045d1855625d0b0a40ad847b8f9d85bf..21061de5ca958a2b4824076f4eeebf2983d36520 100644 (file)
--- 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
@@ -9,15 +9,15 @@ Subject: [PATCH 163/171] spi: bcm2835: Fix buld error from previous commit
 
 --- 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);
+@@ -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)
  {
-@@ -607,7 +606,6 @@ static void bcm2835_spi_handle_err(struc
+@@ -624,7 +623,6 @@ static void bcm2835_spi_handle_err(struc
        /* and reset */
        bcm2835_spi_reset_hw(master);
  }