From 07bd1c4a82d1787d6acc32b5e3873cca24f39769 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Wed, 27 Sep 2006 08:18:55 +0100 Subject: [POWERPC] Use check_legacy_ioport() for ISAPnP Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras --- drivers/pnp/isapnp/core.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'drivers/pnp') 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); -- cgit v1.2.2