[POWERPC] Use check_legacy_ioport() for ISAPnP

Signed-off-by: David Woodhouse <[email protected]>
Signed-off-by: Paul Mackerras <[email protected]>
This commit is contained in:
David Woodhouse 2006-09-27 08:18:55 +01:00 • committed by Paul Mackerras
commit 07bd1c4a82

View file

@ -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);