summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-09-22 14:41:31 -0700
committerKumar Gala <galak@kernel.crashing.org>2008-09-23 10:41:28 -0500
commit68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6 (patch)
tree919ec52758fd0b77f8e429d1eb135835532c49c7 /drivers/block
parent1e16dfc1baa745dd89b95f6e33e4142df6218066 (diff)
downloadop-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/block')
-rw-r--r--drivers/block/floppy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 395f8ea..5813e0d 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4165,7 +4165,7 @@ static int __init floppy_init(void)
int i, unit, drive;
int err, dr;
-#if defined(CONFIG_PPC_MERGE)
+#if defined(CONFIG_PPC)
if (check_legacy_ioport(FDC1))
return -ENODEV;
#endif
OpenPOWER on IntegriCloud