aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.18/431-spi-add-various-flags.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:48:26 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:48:26 +0000
commit2f99e562e03487b927782fcd0f690346d71c34e1 (patch)
tree0e0299593a79411fc54596a60bcc0b05db458703 /target/linux/ar71xx/patches-3.18/431-spi-add-various-flags.patch
parent0625aaa6f37dcf6a2ffb611245fa9b6477642b78 (diff)
downloadupstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.gz
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.bz2
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.zip
CC: kernel: update kernel 3.18 to version 3.18.23
Changelog: * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23 backport of r47334. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/431-spi-add-various-flags.patch')
-rw-r--r--target/linux/ar71xx/patches-3.18/431-spi-add-various-flags.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-3.18/431-spi-add-various-flags.patch b/target/linux/ar71xx/patches-3.18/431-spi-add-various-flags.patch
index 91a4ff34c5..bf8bd84940 100644
--- a/target/linux/ar71xx/patches-3.18/431-spi-add-various-flags.patch
+++ b/target/linux/ar71xx/patches-3.18/431-spi-add-various-flags.patch
@@ -1,6 +1,6 @@
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
-@@ -620,6 +620,8 @@ struct spi_transfer {
+@@ -622,6 +622,8 @@ struct spi_transfer {
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 */
-@@ -665,6 +667,7 @@ struct spi_message {
+@@ -667,6 +669,7 @@ struct spi_message {
struct spi_device *spi;
unsigned is_dma_mapped:1;