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

[~andy/linux] / include / linux / ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 5acdbe51348a6232b06887f3463a9313d8bd8849..7b02aa5ce9b4d30c803840376182797e15f9c3dc 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -362,7 +362,7 @@ struct ide_drive_s;
 struct ide_disk_ops {
        int             (*check)(struct ide_drive_s *, const char *);
        int             (*get_capacity)(struct ide_drive_s *);
-       u64             (*set_capacity)(struct ide_drive_s *, u64);
+       void            (*unlock_native_capacity)(struct ide_drive_s *);
        void            (*setup)(struct ide_drive_s *);
        void            (*flush)(struct ide_drive_s *);
        int             (*init_media)(struct ide_drive_s *, struct gendisk *);