X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fblock%2Ffloppy.c;h=2cea27aba9a06c385d62efc49749753da0ae26ce;hb=9779a8325a9bbf4ccd3853e0e4064984cf9da9c9;hp=cf64ddf5d83924a1c6445a207ee7d21825483436;hpb=6b2ada82101a08e2830fb29d7dc9b858be637dd4;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index cf64ddf5d83..2cea27aba9a 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4172,7 +4172,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