From 09bf54e3b9e67ba425e31d926679d532155995f3 Mon Sep 17 00:00:00 2001
From: Daniel Hellstrom <daniel@gaisler.com>
Date: Tue, 4 Jan 2011 01:41:35 +0000
Subject: [PATCH] --- yaml --- r: 225722 b: refs/heads/master c:
 f28f3313aa97dcb46954f90f596d75f8faf4626e h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/serial/apbuart.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f27f5d4526ae..9671adb25957 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d89ddf0da8f0a140d4dc2e2dbc594fb278e33db5
+refs/heads/master: f28f3313aa97dcb46954f90f596d75f8faf4626e
diff --git a/trunk/drivers/serial/apbuart.c b/trunk/drivers/serial/apbuart.c
index 7160345a184e..767ce9e396c5 100644
--- a/trunk/drivers/serial/apbuart.c
+++ b/trunk/drivers/serial/apbuart.c
@@ -26,6 +26,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/serial_core.h>
@@ -573,7 +574,6 @@ static int __devinit apbuart_probe(struct platform_device *op,
 	printk(KERN_INFO "grlib-apbuart at 0x%llx, irq %d\n",
 	       (unsigned long long) port->mapbase, port->irq);
 	return 0;
-
 }
 
 static struct of_device_id __initdata apbuart_match[] = {
@@ -623,9 +623,12 @@ static void grlib_apbuart_configure(void)
 		int *vendor = (int *) of_get_property(np, "vendor", NULL);
 		int *device = (int *) of_get_property(np, "device", NULL);
 		int *irqs = (int *) of_get_property(np, "interrupts", NULL);
+		int *ampopts = (int *) of_get_property(np, "ampopts", NULL);
 		regs = (struct amba_prom_registers *)
 		    of_get_property(np, "reg", NULL);
 
+		if (ampopts && (*ampopts == 0))
+			continue; /* Ignore if used by another OS instance */
 		if (vendor)
 			v = *vendor;
 		if (device)