From ba807bb825030becb8ca54d167ce0e254512f227 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Wed, 27 Sep 2006 08:18:55 +0100
Subject: [PATCH] --- yaml --- r: 38185 b: refs/heads/master c:
 07bd1c4a82d1787d6acc32b5e3873cca24f39769 h: refs/heads/master i:   38183:
 e0f688c4f77724b94cd590ec1c961ad7202175ed v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pnp/isapnp/core.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8cec453af525..44a8a648391a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61e37ca22b717a9edc3e5e7c7f3603fad464c76d
+refs/heads/master: 07bd1c4a82d1787d6acc32b5e3873cca24f39769
diff --git a/trunk/drivers/pnp/isapnp/core.c b/trunk/drivers/pnp/isapnp/core.c
index f2e0179962e2..3ac5b123215a 100644
--- a/trunk/drivers/pnp/isapnp/core.c
+++ b/trunk/drivers/pnp/isapnp/core.c
@@ -1049,6 +1049,10 @@ static int __init isapnp_init(void)
 		printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
 		return 0;
 	}
+#ifdef CONFIG_PPC_MERGE
+	if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP))
+		return -EINVAL;
+#endif
 #ifdef ISAPNP_REGION_OK
 	if (!request_region(_PIDXR, 1, "isapnp index")) {
 		printk(KERN_ERR "isapnp: Index Register 0x%x already used\n", _PIDXR);