diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/drm/drm_hashtab.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/drm/drm_hashtab.h')
| -rw-r--r-- | include/drm/drm_hashtab.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_hashtab.h b/include/drm/drm_hashtab.h index cd2b189e1be6..0af087a4d3b3 100644 --- a/include/drm/drm_hashtab.h +++ b/include/drm/drm_hashtab.h | |||
| @@ -35,6 +35,8 @@ | |||
| 35 | #ifndef DRM_HASHTAB_H | 35 | #ifndef DRM_HASHTAB_H |
| 36 | #define DRM_HASHTAB_H | 36 | #define DRM_HASHTAB_H |
| 37 | 37 | ||
| 38 | #include <linux/list.h> | ||
| 39 | |||
| 38 | #define drm_hash_entry(_ptr, _type, _member) container_of(_ptr, _type, _member) | 40 | #define drm_hash_entry(_ptr, _type, _member) container_of(_ptr, _type, _member) |
| 39 | 41 | ||
| 40 | struct drm_hash_item { | 42 | struct drm_hash_item { |