--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
-@@ -452,6 +452,8 @@ struct spi_transfer {
+@@ -503,6 +503,8 @@ struct spi_transfer {
dma_addr_t rx_dma;
unsigned cs_change:1;
u8 bits_per_word;
u16 delay_usecs;
u32 speed_hz;
-@@ -493,6 +495,7 @@ struct spi_message {
+@@ -544,6 +546,7 @@ struct spi_message {
struct spi_device *spi;
unsigned is_dma_mapped:1;