md: revise Kconfig help for MD_MULTIPATH

[safe/jmp/linux-2.6] / drivers / block / amiflop.c

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 80a68b2..0552258 100644 (file)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1342,12 +1342,11 @@ static void redo_fd_request(void)
        int err;
 
 next_req:
-       rq = elv_next_request(floppy_queue);
+       rq = blk_fetch_request(floppy_queue);
        if (!rq) {
                /* Nothing left to do */
                return;
        }
-       blkdev_dequeue_request(rq);
 
        floppy = rq->rq_disk->private_data;
        drive = floppy - unit;
@@ -1633,7 +1632,7 @@ static int amiga_floppy_change(struct gendisk *disk)
        return 0;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
        .owner          = THIS_MODULE,
        .open           = floppy_open,
        .release        = floppy_release,
@@ -1646,7 +1645,7 @@ static int __init fd_probe_drives(void)
 {
        int drive,drives,nomem;
 
-       printk(KERN_INFO "FD: probing units\n" KERN_INFO "found ");
+       printk(KERN_INFO "FD: probing units\nfound ");
        drives=0;
        nomem=0;
        for(drive=0;drive<FD_MAX_UNITS;drive++) {