Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

[pandora-kernel.git] / arch / arm / mach-davinci / serial.c

diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c
index 81af42c..1875740 100644 (file)
--- a/arch/arm/mach-davinci/serial.c
+++ b/arch/arm/mach-davinci/serial.c
@@ -107,7 +107,7 @@ int __init davinci_serial_init(struct davinci_uart_config *info)
                                pr_err("uart regs ioremap failed\n");
                }
 
-               if (p->membase)
+               if (p->membase && p->type != PORT_AR7)
                        davinci_serial_reset(p);
        }