summaryrefslogtreecommitdiff
path: root/drivers/pnp
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-09-27 08:18:55 +0100
committerPaul Mackerras <paulus@samba.org>2006-10-02 20:27:36 +1000
commit07bd1c4a82d1787d6acc32b5e3873cca24f39769 (patch)
tree313a29b73f9b4f2e19fa9f27651d20295eb4b031 /drivers/pnp
parent61e37ca22b717a9edc3e5e7c7f3603fad464c76d (diff)
[POWERPC] Use check_legacy_ioport() for ISAPnP
Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/pnp')
-rw-r--r--drivers/pnp/isapnp/core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index f2e0179962e2..3ac5b123215a 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/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);