Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[~andy/linux] / drivers / tty / serial / ifx6x60.h

diff --git a/drivers/tty/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h
index e8464baf9e75d985140a038f64e008981eb0780a..4fbddc297839d6ac5e50346ff3c035fa5498b4db 100644 (file)
--- a/drivers/tty/serial/ifx6x60.h
+++ b/drivers/tty/serial/ifx6x60.h
@@ -41,6 +41,7 @@
 #define IFX_SPI_STATE_IO_IN_PROGRESS   1
 #define IFX_SPI_STATE_IO_READY         2
 #define IFX_SPI_STATE_TIMER_PENDING    3
+#define IFX_SPI_STATE_IO_AVAILABLE     4
 
 /* flow control bitfields */
 #define IFX_SPI_DCD                    0
@@ -124,6 +125,7 @@ struct ifx_spi_device {
 #define MR_INPROGRESS  1
 #define MR_COMPLETE    2
        wait_queue_head_t mdm_reset_wait;
+       void (*swap_buf)(unsigned char *buf, int len, void *end);
 };
 
 #endif /* _IFX6X60_H */