git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
board-mx51_babbage.c
diff --git
a/arch/arm/mach-mx5/board-mx51_babbage.c
b/arch/arm/mach-mx5/board-mx51_babbage.c
index
e400b09
..
11b0ff6
100644
(file)
--- 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);
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();
imx51_add_imx_uart(2, &uart_pdata);
babbage_fec_reset();