diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-01 06:47:58 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-01 06:47:58 -0500 |
| commit | 55f2b78995826d549401bdf20abeac1832636bb6 (patch) | |
| tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /drivers/ide/ide-gd.h | |
| parent | f5c1aa1537be39d8b9bb5279b5881d81898fd3cd (diff) | |
| parent | 92b9af9e4f144535c65aee673cfad309f25fa465 (diff) | |
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'drivers/ide/ide-gd.h')
| -rw-r--r-- | drivers/ide/ide-gd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-gd.h b/drivers/ide/ide-gd.h index a86779f0756b..b604bdd318a1 100644 --- a/drivers/ide/ide-gd.h +++ b/drivers/ide/ide-gd.h | |||
| @@ -17,7 +17,7 @@ struct ide_disk_obj { | |||
| 17 | ide_drive_t *drive; | 17 | ide_drive_t *drive; |
| 18 | struct ide_driver *driver; | 18 | struct ide_driver *driver; |
| 19 | struct gendisk *disk; | 19 | struct gendisk *disk; |
| 20 | struct kref kref; | 20 | struct device dev; |
| 21 | unsigned int openers; /* protected by BKL for now */ | 21 | unsigned int openers; /* protected by BKL for now */ |
| 22 | 22 | ||
| 23 | /* Last failed packet command */ | 23 | /* Last failed packet command */ |