diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-09-22 14:41:31 -0700 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-09-23 10:41:28 -0500 |
| commit | 68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6 (patch) | |
| tree | 919ec52758fd0b77f8e429d1eb135835532c49c7 /drivers/pnp | |
| parent | 1e16dfc1baa745dd89b95f6e33e4142df6218066 (diff) | |
| download | op-kernel-dev-68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6.zip op-kernel-dev-68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6.tar.gz | |
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')
| -rw-r--r-- | drivers/pnp/isapnp/core.c | 2 | ||||
| -rw-r--r-- | drivers/pnp/pnpbios/core.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index 101a835..46455fba 100644 --- 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 diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c index 19a4be1..0797dd1 100644 --- a/drivers/pnp/pnpbios/core.c +++ b/drivers/pnp/pnpbios/core.c @@ -519,7 +519,7 @@ static int __init pnpbios_init(void) { int ret; -#if defined(CONFIG_PPC_MERGE) +#if defined(CONFIG_PPC) if (check_legacy_ioport(PNPBIOS_BASE)) return -ENODEV; #endif @@ -577,7 +577,7 @@ static int __init pnpbios_thread_init(void) { struct task_struct *task; -#if defined(CONFIG_PPC_MERGE) +#if defined(CONFIG_PPC) if (check_legacy_ioport(PNPBIOS_BASE)) return 0; #endif |
