mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-22 17:01:14 +00:00
Code Issues Releases Wiki Activity

[POWERPC] Use check_legacy_ioport() for ISAPnP

Browse source 
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
David Woodhouse 2006-09-27 08:18:55 +01:00 committed by Paul Mackerras
parent 61e37ca22b
commit 07bd1c4a82
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/pnp/isapnp/core.c
View file

@ -1049,6 +1049,10 @@ static int __init isapnp_init(void)
printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n"); printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
return 0; return 0;
} }
#ifdef CONFIG_PPC_MERGE
if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP))
return -EINVAL;
#endif
#ifdef ISAPNP_REGION_OK #ifdef ISAPNP_REGION_OK
if (!request_region(_PIDXR, 1, "isapnp index")) { if (!request_region(_PIDXR, 1, "isapnp index")) {
printk(KERN_ERR "isapnp: Index Register 0x%x already used\n", _PIDXR); printk(KERN_ERR "isapnp: Index Register 0x%x already used\n", _PIDXR);