Merge branch 'devel-stable' into devel

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 3981e0356d12..0aa858ebc573 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -524,6 +524,10 @@ static void __init trizeps4_init(void)
                                         ARRAY_SIZE(trizeps4_devices));
         }
 
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+
         if (0)  /* dont know how to determine LCD */
                 set_pxa_fb_info(&sharp_lcd);
         else