Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

Merge branch 'davinci' into devel
This commit is contained in:
Russell King
2008-10-09 21:33:05 +01:00
committed by Russell King
113 changed files with 1868 additions and 988 deletions

View File

@@ -56,7 +56,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 = {