Merge branch 'fix/hda' into topic/hda

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-gd.h

diff --git a/drivers/ide/ide-gd.h b/drivers/ide/ide-gd.h
index 7d3d101713e0682a21e5b69ef7bd2dcac86d833c..a86779f0756b7c117ece8a93c3acaa649c6dd9d9 100644 (file)
--- a/drivers/ide/ide-gd.h
+++ b/drivers/ide/ide-gd.h
@@ -14,11 +14,11 @@
 #endif
 
 struct ide_disk_obj {
-       ide_drive_t     *drive;
-       ide_driver_t    *driver;
-       struct gendisk  *disk;
-       struct kref     kref;
-       unsigned int    openers;        /* protected by BKL for now */
+       ide_drive_t             *drive;
+       struct ide_driver       *driver;
+       struct gendisk          *disk;
+       struct kref             kref;
+       unsigned int            openers;        /* protected by BKL for now */
 
        /* Last failed packet command */
        struct ide_atapi_pc *failed_pc;