diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-03-04 00:05:42 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-03-04 00:05:42 -0500 |
| commit | 2e22ea7cea0f7de86fd30df867fbf5b7e8eee0fd (patch) | |
| tree | 8b8e5583fb2787ff7107a6f59b114ddcd2c2f691 /include/linux/ide.h | |
| parent | 638bee71c83a2837b48062fdc5b222163cf53d79 (diff) | |
| parent | 645af4e9e0e32481e3336dda813688732c7e5f0f (diff) | |
Merge branch 'x86/core' into x86/mce2
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 194da5a4b0d6..fe235b65207e 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -663,7 +663,7 @@ typedef struct ide_drive_s ide_drive_t; | |||
| 663 | #define to_ide_device(dev) container_of(dev, ide_drive_t, gendev) | 663 | #define to_ide_device(dev) container_of(dev, ide_drive_t, gendev) |
| 664 | 664 | ||
| 665 | #define to_ide_drv(obj, cont_type) \ | 665 | #define to_ide_drv(obj, cont_type) \ |
| 666 | container_of(obj, struct cont_type, kref) | 666 | container_of(obj, struct cont_type, dev) |
| 667 | 667 | ||
| 668 | #define ide_drv_g(disk, cont_type) \ | 668 | #define ide_drv_g(disk, cont_type) \ |
| 669 | container_of((disk)->private_data, struct cont_type, driver) | 669 | container_of((disk)->private_data, struct cont_type, driver) |