X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fblock%2Ffloppy.c;h=dff1e67b1dd4e2768447ac92465caf8e1cceb97a;hb=35a5d9ed9fedb74c22cb19ff7d749289473144e0;hp=bedb689b051fe5cb9e58667b082673208b41cc81;hpb=95d465fd750897ab32462a6702fbfe1b122cbbc0;p=sfrench%2Fcifs-2.6.git

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index bedb689b051f..dff1e67b1dd4 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;