diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/asm-arm/arch-imx/imx-uart.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
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 | ||