git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks
[safe/jmp/linux-2.6]
/
drivers
/
pnp
/
isapnp
/
core.c
diff --git
a/drivers/pnp/isapnp/core.c
b/drivers/pnp/isapnp/core.c
index
101a835
..
46455fb
100644
(file)
--- a/
drivers/pnp/isapnp/core.c
+++ b/
drivers/pnp/isapnp/core.c
@@
-1012,7
+1012,7
@@
static int __init isapnp_init(void)
printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
return 0;
}
-#ifdef CONFIG_PPC
_MERGE
+#ifdef CONFIG_PPC
if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP))
return -EINVAL;
#endif