[POWERPC] Use check_legacy_ioport() for ISAPnP
Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
61e37ca22b
commit
07bd1c4a82
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue