diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 15:45:44 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 15:45:44 +0000 |
| commit | 143ed290f02496fb918789cf14949e4e8033d34d (patch) | |
| tree | 02a2f503d4b6fac4598f326b8fa7ad009055c8c2 /arch/arm/mach-mx5/board-mx51_babbage.c | |
| parent | ac9cf9ff4f4ffa355d0e93c2bd6d74961a16efad (diff) | |
| parent | d9c927833a42b4eaae4addd031f780f4530f7a2d (diff) | |
| download | linux-3.10-143ed290f02496fb918789cf14949e4e8033d34d.tar.gz linux-3.10-143ed290f02496fb918789cf14949e4e8033d34d.tar.bz2 linux-3.10-143ed290f02496fb918789cf14949e4e8033d34d.zip | |
Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-mx5/board-mx51_babbage.c')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_babbage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c index e400b09109c..11b0ff67f89 100644 --- a/arch/arm/mach-mx5/board-mx51_babbage.c +++ b/arch/arm/mach-mx5/board-mx51_babbage.c @@ -369,7 +369,7 @@ static void __init mx51_babbage_init(void) ARRAY_SIZE(mx51babbage_pads)); imx51_add_imx_uart(0, &uart_pdata); - imx51_add_imx_uart(1, &uart_pdata); + imx51_add_imx_uart(1, NULL); imx51_add_imx_uart(2, &uart_pdata); babbage_fec_reset(); |