Merge branches 'bugzilla-14446', 'bugzilla-14753' and 'bugzilla-14824' into release

[karo-tx-linux.git] / drivers / block / amiflop.c

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 9c6e5b0fe894f9e6af94a50b87a2ec2b2f04a470..0552258390240ae8f71ebf89d09c4542eff749e9 100644 (file)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1632,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,
@@ -1645,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++) {