diff options
Diffstat (limited to 'drivers/pnp/isapnp')
| -rw-r--r-- | drivers/pnp/isapnp/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index bd213ffbcd9e..e851160e14f0 100644 --- a/drivers/pnp/isapnp/core.c +++ b/drivers/pnp/isapnp/core.c | |||
| @@ -1012,7 +1012,7 @@ static int __init isapnp_init(void) | |||
| 1012 | printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n"); | 1012 | printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n"); |
| 1013 | return 0; | 1013 | return 0; |
| 1014 | } | 1014 | } |
| 1015 | #ifdef CONFIG_PPC_MERGE | 1015 | #ifdef CONFIG_PPC |
| 1016 | if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP)) | 1016 | if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP)) |
| 1017 | return -EINVAL; | 1017 | return -EINVAL; |
| 1018 | #endif | 1018 | #endif |