diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
| commit | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (patch) | |
| tree | b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42 /arch/arm/plat-mxc/include/mach | |
| parent | 37f9ef553bed630957e025504cdcbc76f5de49d5 (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/kernel/asm-offsets.c
Diffstat (limited to 'arch/arm/plat-mxc/include/mach')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/imx-uart.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/imx-uart.h b/arch/arm/plat-mxc/include/mach/imx-uart.h index 599217b2e13f..f9bd17dd8dd7 100644 --- a/arch/arm/plat-mxc/include/mach/imx-uart.h +++ b/arch/arm/plat-mxc/include/mach/imx-uart.h | |||
| @@ -20,11 +20,16 @@ | |||
| 20 | #define ASMARM_ARCH_UART_H | 20 | #define ASMARM_ARCH_UART_H |
| 21 | 21 | ||
| 22 | #define IMXUART_HAVE_RTSCTS (1<<0) | 22 | #define IMXUART_HAVE_RTSCTS (1<<0) |
| 23 | #define IMXUART_IRDA (1<<1) | ||
| 23 | 24 | ||
| 24 | struct imxuart_platform_data { | 25 | struct imxuart_platform_data { |
| 25 | int (*init)(struct platform_device *pdev); | 26 | int (*init)(struct platform_device *pdev); |
| 26 | int (*exit)(struct platform_device *pdev); | 27 | int (*exit)(struct platform_device *pdev); |
| 27 | unsigned int flags; | 28 | unsigned int flags; |
| 29 | void (*irda_enable)(int enable); | ||
| 30 | unsigned int irda_inv_rx:1; | ||
| 31 | unsigned int irda_inv_tx:1; | ||
| 32 | unsigned short transceiver_delay; | ||
| 28 | }; | 33 | }; |
| 29 | 34 | ||
| 30 | #endif | 35 | #endif |