diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-09 16:50:53 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-09 16:50:53 +1100 |
commit | f41b9cea9280c1df1e7bb2ae06a67d2322a187b6 (patch) | |
tree | a4b029c9e08eda350c1650803877577272b8bbe8 /drivers/tty/serial/ifx6x60.h | |
parent | 3cf560ca9cf0b8c6967a19b06ec13da551124088 (diff) | |
parent | 550462378515a82279e07f12e2c105f617f112f8 (diff) |
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
Diffstat (limited to 'drivers/tty/serial/ifx6x60.h')
-rw-r--r-- | drivers/tty/serial/ifx6x60.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h index deb7b8d977dc..e8464baf9e75 100644 --- a/drivers/tty/serial/ifx6x60.h +++ b/drivers/tty/serial/ifx6x60.h @@ -29,8 +29,6 @@ #define DRVNAME "ifx6x60" #define TTYNAME "ttyIFX" -/* #define IFX_THROTTLE_CODE */ - #define IFX_SPI_MAX_MINORS 1 #define IFX_SPI_TRANSFER_SIZE 2048 #define IFX_SPI_FIFO_SIZE 4096 @@ -88,7 +86,9 @@ struct ifx_spi_device { dma_addr_t rx_dma; dma_addr_t tx_dma; - int is_6160; /* Modem type */ + int modem; /* Modem type */ + int use_dma; /* provide dma-able addrs in SPI msg */ + long max_hz; /* max SPI frequency */ spinlock_t write_lock; int write_pending; |