ar71xx: refresh 4.1 patches

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-4.1 / 431-spi-add-various-flags.patch

diff --git a/target/linux/ar71xx/patches-4.1/431-spi-add-various-flags.patch b/target/linux/ar71xx/patches-4.1/431-spi-add-various-flags.patch
index 91a4ff34c5cda1ae1a839ff182051b59aeb3d46f..8b25c9389b05f51317fa729614af636c0765d4ee 100644 (file)
--- a/target/linux/ar71xx/patches-4.1/431-spi-add-various-flags.patch
+++ b/target/linux/ar71xx/patches-4.1/431-spi-add-various-flags.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/spi/spi.h
 +++ b/include/linux/spi/spi.h
 --- a/include/linux/spi/spi.h
 +++ b/include/linux/spi/spi.h

-@@ -620,6 +620,8 @@ struct spi_transfer {
+@@ -618,6 +618,8 @@ struct spi_transfer {

        unsigned        cs_change:1;
        unsigned        tx_nbits:3;
        unsigned        rx_nbits:3;
        unsigned        cs_change:1;
        unsigned        tx_nbits:3;
        unsigned        rx_nbits:3;


@@ -9,7 +9,7 @@
  #define       SPI_NBITS_SINGLE        0x01 /* 1bit transfer */
  #define       SPI_NBITS_DUAL          0x02 /* 2bits transfer */
  #define       SPI_NBITS_QUAD          0x04 /* 4bits transfer */
  #define       SPI_NBITS_SINGLE        0x01 /* 1bit transfer */
  #define       SPI_NBITS_DUAL          0x02 /* 2bits transfer */
  #define       SPI_NBITS_QUAD          0x04 /* 4bits transfer */

-@@ -665,6 +667,7 @@ struct spi_message {
+@@ -663,6 +665,7 @@ struct spi_message {

        struct spi_device       *spi;
  
        unsigned                is_dma_mapped:1;
        struct spi_device       *spi;
  
        unsigned                is_dma_mapped:1;