aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/isapnp
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-09-22 17:41:31 -0400
committerKumar Gala <galak@kernel.crashing.org>2008-09-23 11:41:28 -0400
commit68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6 (patch)
tree919ec52758fd0b77f8e429d1eb135835532c49c7 /drivers/pnp/isapnp
parent1e16dfc1baa745dd89b95f6e33e4142df6218066 (diff)
powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks
Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all powerpc platforms and we want to get rid of CONFIG_PPC_MERGE use CONFIG_PPC instead. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/pnp/isapnp')
-rw-r--r--drivers/pnp/isapnp/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 101a835e8759..46455fbab6d5 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