diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
| commit | 1e09481365ce248dbb4eb06dad70129bb5807037 (patch) | |
| tree | c0cff5bef95c8b5e7486f144718ade9a06c284dc /include/asm-arm/arch-imx/imx-uart.h | |
| parent | 3e2f69fdd1b00166e7d589bce56b2d36a9e74374 (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/softlockup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 | ||