diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 14:07:00 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 14:07:00 +0200 |
commit | 6e03f99803195e5aaf7f247db31b0d11857ccc35 (patch) | |
tree | ffd4b1a140854977e984a4390105333845c0e90c /arch/arm/mach-mx3/pcm037.c | |
parent | 982162602b31041b426edec6480d327743abcbcc (diff) | |
parent | 6bfb09a1005193be5c81ebac9f3ef85210142650 (diff) |
Merge branch 'linus' into x86/iommu
Conflicts:
lib/swiotlb.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-mx3/pcm037.c')
-rw-r--r-- | arch/arm/mach-mx3/pcm037.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c index 0a152ed15a8..df8582a6231 100644 --- a/arch/arm/mach-mx3/pcm037.c +++ b/arch/arm/mach-mx3/pcm037.c @@ -54,7 +54,7 @@ static struct platform_device pcm037_flash = { }; static struct imxuart_platform_data uart_pdata = { - .flags = 0, + .flags = IMXUART_HAVE_RTSCTS, }; static struct platform_device *devices[] __initdata = { |