X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fblock%2Ffloppy.c;h=dff1e67b1dd4e2768447ac92465caf8e1cceb97a;hb=a2b524b2ec6caa0499aea56a58fdb67a6d10db90;hp=bedb689b051fe5cb9e58667b082673208b41cc81;hpb=74d89c16735d83349ea74232031819e989a49156;p=linux-2.6

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index bedb689b05..dff1e67b1d 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4301,7 +4301,7 @@ static int __init floppy_init(void)
 	}
 
 	use_virtual_dma = can_use_virtual_dma & 1;
-#if defined(CONFIG_PPC64)
+#if defined(CONFIG_PPC_MERGE)
 	if (check_legacy_ioport(FDC1)) {
 		del_timer(&fd_timeout);
 		err = -ENODEV;