diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /include/asm-arm/arch-imx/imx-uart.h | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a (diff) | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 (diff) | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'include/asm-arm/arch-imx/imx-uart.h')
| -rw-r--r-- | include/asm-arm/arch-imx/imx-uart.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-imx/imx-uart.h b/include/asm-arm/arch-imx/imx-uart.h index 3a685e1780ea..d54eb1d48026 100644 --- a/include/asm-arm/arch-imx/imx-uart.h +++ b/include/asm-arm/arch-imx/imx-uart.h | |||
| @@ -4,6 +4,8 @@ | |||
| 4 | #define IMXUART_HAVE_RTSCTS (1<<0) | 4 | #define IMXUART_HAVE_RTSCTS (1<<0) |
| 5 | 5 | ||
| 6 | struct imxuart_platform_data { | 6 | struct imxuart_platform_data { |
| 7 | int (*init)(struct platform_device *pdev); | ||
| 8 | void (*exit)(struct platform_device *pdev); | ||
| 7 | unsigned int flags; | 9 | unsigned int flags; |
| 8 | }; | 10 | }; |
| 9 | 11 | ||