git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
palmz72.c
diff --git
a/arch/arm/mach-pxa/palmz72.c
b/arch/arm/mach-pxa/palmz72.c
index c2bf493c5f53fe7d91cc4a65742b0fb109ceaaa8..d787ac7cfdd808cac37939c226a1c233ab222915 100644
(file)
--- a/
arch/arm/mach-pxa/palmz72.c
+++ b/
arch/arm/mach-pxa/palmz72.c
@@
-491,6
+491,10
@@
static void __init palmz72_init(void)
{
pxa2xx_mfp_config(ARRAY_AND_SIZE(palmz72_pin_config));
+ pxa_set_ffuart_info(NULL);
+ pxa_set_btuart_info(NULL);
+ pxa_set_stuart_info(NULL);
+
set_pxa_fb_info(&palmz72_lcd_screen);
pxa_set_mci_info(&palmz72_mci_platform_data);
palmz72_udc_init();