diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-09-22 21:41:31 (GMT) |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-09-23 15:41:28 (GMT) |
commit | 68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6 (patch) | |
tree | 919ec52758fd0b77f8e429d1eb135835532c49c7 /drivers/pnp/pnpbios | |
parent | 1e16dfc1baa745dd89b95f6e33e4142df6218066 (diff) | |
download | linux-68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6.tar.xz |
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/pnpbios')
-rw-r--r-- | drivers/pnp/pnpbios/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |