2 files changed, 1 insertions, 4 deletions

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index cf64ddf5d839..2cea27aba9a0 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
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index f1c8feb5510b..1730d29e6044 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -249,7 +249,6 @@ static int send_request(struct request *req)
         struct HvLpEvent *hev;
         struct scatterlist sg[VIOMAXBLOCKDMA];
         int sgindex;
-        int statindex;
         struct viodasd_device *d;
         unsigned long flags;
 
@@ -258,11 +257,9 @@ static int send_request(struct request *req)
         if (rq_data_dir(req) == READ) {
                 direction = DMA_FROM_DEVICE;
                 viocmd = viomajorsubtype_blockio | vioblockread;
-                statindex = 0;
         } else {
                 direction = DMA_TO_DEVICE;
                 viocmd = viomajorsubtype_blockio | vioblockwrite;
-                statindex = 1;
         }
 
         d = req->rq_disk->private_data;