diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-01 12:48:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-01 12:48:28 +0100 |
| commit | 645af4e9e0e32481e3336dda813688732c7e5f0f (patch) | |
| tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /drivers/ide/ide-cd.h | |
| parent | ecc25fbd6b9e07b33895c61ddf84006b00f55d99 (diff) | |
| parent | 55f2b78995826d549401bdf20abeac1832636bb6 (diff) | |
Merge branch 'x86/pat' into x86/core
Diffstat (limited to 'drivers/ide/ide-cd.h')
| -rw-r--r-- | drivers/ide/ide-cd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index ac40d6cb90a..c878bfcf111 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h @@ -80,7 +80,7 @@ struct cdrom_info { ide_drive_t *drive; struct ide_driver *driver; struct gendisk *disk; - struct kref kref; + struct device dev; /* Buffer for table of contents. NULL if we haven't allocated a TOC buffer for this device yet. */ |