Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[muen/linux.git] / drivers / ide / ide-floppy.c

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 780d33ccc5d84eef81e98f2549667aacbb981c0a..1ea2f9e82bf83838caed631413f5cf8dcdb3ded0 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -427,7 +427,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
                                 * (maintains previous driver behaviour)
                                 */
                                break;
                                 * (maintains previous driver behaviour)
                                 */
                                break;

-                       /* else: fall through */
+                       /* fall through */

                case CAPACITY_CURRENT:
                        /* Normal Zip/LS-120 disks */
                        if (memcmp(cap_desc, &floppy->cap_desc, 8))
                case CAPACITY_CURRENT:
                        /* Normal Zip/LS-120 disks */
                        if (memcmp(cap_desc, &floppy->cap_desc, 8))