diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
| commit | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch) | |
| tree | eb2060681552a00e9efa98224b95f69a3dc84390 /arch/arm/mach-mx3/pcm037.c | |
| parent | b1add0480a95b6ceaece5caf6c50614771eae9b2 (diff) | |
| parent | 7bff3c4ce44ea48f50dc47a5994454984bd08c59 (diff) | |
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
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 03374f9e0000..11fda95c86a5 100644 --- a/arch/arm/mach-mx3/pcm037.c +++ b/arch/arm/mach-mx3/pcm037.c | |||
| @@ -56,7 +56,7 @@ static struct platform_device pcm037_flash = { | |||
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | static struct imxuart_platform_data uart_pdata = { | 58 | static struct imxuart_platform_data uart_pdata = { |
| 59 | .flags = 0, | 59 | .flags = IMXUART_HAVE_RTSCTS, |
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | static struct platform_device *devices[] __initdata = { | 62 | static struct platform_device *devices[] __initdata = { |