From 407280f9a71cce69b4a43abec7217b92022da5f1 Mon Sep 17 00:00:00 2001
From: Cyril Chemparathy <cyril@ti.com>
Date: Sun, 2 May 2010 14:28:14 -0400
Subject: [PATCH] --- yaml --- r: 192110 b: refs/heads/master c:
 e2800007f3b9aab51c1fe866034db576d3a9fd83 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-davinci/serial.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f5579bcc17f0..8fbd6d59040c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ee1acefa86083c6acf4112983b88a0057eb7785
+refs/heads/master: e2800007f3b9aab51c1fe866034db576d3a9fd83
diff --git a/trunk/arch/arm/mach-davinci/serial.c b/trunk/arch/arm/mach-davinci/serial.c
index 81af42ca29d2..1875740fe27c 100644
--- a/trunk/arch/arm/mach-davinci/serial.c
+++ b/trunk/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);
 	}